Completed
Push — master ( 7193bc...d7424f )
by Aimeos
19:48
created
Controller/CatalogController.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -28,9 +28,9 @@  discard block
 block discarded – undo
28 28
 	 */
29 29
 	public function countAction()
30 30
 	{
31
-		$params = $this->get( 'aimeos_page' )->getSections( 'catalog-count' );
32
-		$response = $this->render( 'AimeosShopBundle:Catalog:count.html.twig', $params )->setMaxAge( 300 );
33
-		$response->headers->set( 'Content-Type', 'application/javascript' );
31
+		$params = $this->get('aimeos_page')->getSections('catalog-count');
32
+		$response = $this->render('AimeosShopBundle:Catalog:count.html.twig', $params)->setMaxAge(300);
33
+		$response->headers->set('Content-Type', 'application/javascript');
34 34
 		return $response;
35 35
 	}
36 36
 
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
42 42
 	 */
43 43
 	public function detailAction()
44 44
 	{
45
-		$params = $this->get( 'aimeos_page' )->getSections( 'catalog-detail' );
46
-		return $this->render( 'AimeosShopBundle:Catalog:detail.html.twig', $params );
45
+		$params = $this->get('aimeos_page')->getSections('catalog-detail');
46
+		return $this->render('AimeosShopBundle:Catalog:detail.html.twig', $params);
47 47
 	}
48 48
 
49 49
 
@@ -54,8 +54,8 @@  discard block
 block discarded – undo
54 54
 	 */
55 55
 	public function listAction()
56 56
 	{
57
-		$params = $this->get( 'aimeos_page' )->getSections( 'catalog-list' );
58
-		return $this->render( 'AimeosShopBundle:Catalog:list.html.twig', $params );
57
+		$params = $this->get('aimeos_page')->getSections('catalog-list');
58
+		return $this->render('AimeosShopBundle:Catalog:list.html.twig', $params);
59 59
 	}
60 60
 
61 61
 
@@ -66,8 +66,8 @@  discard block
 block discarded – undo
66 66
 	 */
67 67
 	public function treeAction()
68 68
 	{
69
-		$params = $this->get( 'aimeos_page' )->getSections( 'catalog-tree' );
70
-		return $this->render( 'AimeosShopBundle:Catalog:tree.html.twig', $params );
69
+		$params = $this->get('aimeos_page')->getSections('catalog-tree');
70
+		return $this->render('AimeosShopBundle:Catalog:tree.html.twig', $params);
71 71
 	}
72 72
 
73 73
 
@@ -78,9 +78,9 @@  discard block
 block discarded – undo
78 78
 	 */
79 79
 	public function stockAction()
80 80
 	{
81
-		$params = $this->get( 'aimeos_page' )->getSections( 'catalog-stock' );
82
-		$response = $this->render( 'AimeosShopBundle:Catalog:stock.html.twig', $params )->setMaxAge( 30 );
83
-		$response->headers->set( 'Content-Type', 'application/javascript' );
81
+		$params = $this->get('aimeos_page')->getSections('catalog-stock');
82
+		$response = $this->render('AimeosShopBundle:Catalog:stock.html.twig', $params)->setMaxAge(30);
83
+		$response->headers->set('Content-Type', 'application/javascript');
84 84
 		return $response;
85 85
 	}
86 86
 
@@ -92,9 +92,9 @@  discard block
 block discarded – undo
92 92
 	 */
93 93
 	public function suggestAction()
94 94
 	{
95
-		$params = $this->get( 'aimeos_page' )->getSections( 'catalog-suggest' );
96
-		$response = $this->render( 'AimeosShopBundle:Catalog:suggest.html.twig', $params );
97
-		$response->headers->set( 'Content-Type', 'application/json' );
95
+		$params = $this->get('aimeos_page')->getSections('catalog-suggest');
96
+		$response = $this->render('AimeosShopBundle:Catalog:suggest.html.twig', $params);
97
+		$response->headers->set('Content-Type', 'application/json');
98 98
 		return $response;
99 99
 	}
100 100
 
@@ -106,8 +106,8 @@  discard block
 block discarded – undo
106 106
 	 */
107 107
 	public function countComponentAction()
108 108
 	{
109
-		$response = $this->getOutput( 'catalog/count' )->setMaxAge( 300 );
110
-		$response->headers->set( 'Content-Type', 'application/javascript' );
109
+		$response = $this->getOutput('catalog/count')->setMaxAge(300);
110
+		$response->headers->set('Content-Type', 'application/javascript');
111 111
 		return $response;
112 112
 	}
113 113
 
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 	 */
120 120
 	public function detailComponentAction()
121 121
 	{
122
-		return $this->getOutput( 'catalog/detail' );
122
+		return $this->getOutput('catalog/detail');
123 123
 	}
124 124
 
125 125
 
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 	 */
131 131
 	public function filterComponentAction()
132 132
 	{
133
-		return $this->getOutput( 'catalog/filter' );
133
+		return $this->getOutput('catalog/filter');
134 134
 	}
135 135
 
136 136
 
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 	 */
142 142
 	public function listComponentAction()
143 143
 	{
144
-		return $this->getOutput( 'catalog/lists' );
144
+		return $this->getOutput('catalog/lists');
145 145
 	}
146 146
 
147 147
 
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 	 */
153 153
 	public function sessionComponentAction()
154 154
 	{
155
-		return $this->getOutput( 'catalog/session' );
155
+		return $this->getOutput('catalog/session');
156 156
 	}
157 157
 
158 158
 
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 	 */
164 164
 	public function stageComponentAction()
165 165
 	{
166
-		return $this->getOutput( 'catalog/stage' );
166
+		return $this->getOutput('catalog/stage');
167 167
 	}
168 168
 
169 169
 
@@ -174,8 +174,8 @@  discard block
 block discarded – undo
174 174
 	 */
175 175
 	public function stockComponentAction()
176 176
 	{
177
-		$response = $this->getOutput( 'catalog/stock' )->setMaxAge( 30 );
178
-		$response->headers->set( 'Content-Type', 'application/javascript' );
177
+		$response = $this->getOutput('catalog/stock')->setMaxAge(30);
178
+		$response->headers->set('Content-Type', 'application/javascript');
179 179
 		return $response;
180 180
 	}
181 181
 
@@ -187,8 +187,8 @@  discard block
 block discarded – undo
187 187
 	 */
188 188
 	public function suggestComponentAction()
189 189
 	{
190
-		$response = $this->getOutput( 'catalog/suggest' );
191
-		$response->headers->set( 'Content-Type', 'application/json' );
190
+		$response = $this->getOutput('catalog/suggest');
191
+		$response->headers->set('Content-Type', 'application/json');
192 192
 		return $response;
193 193
 	}
194 194
 }
Please login to merge, or discard this patch.
Controller/AccountController.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -28,8 +28,8 @@  discard block
 block discarded – undo
28 28
 	 */
29 29
 	public function indexAction()
30 30
 	{
31
-		$params = $this->get( 'aimeos_page' )->getSections( 'account-index' );
32
-		return $this->render( 'AimeosShopBundle:Account:index.html.twig', $params )->setPrivate()->setMaxAge( 300 );
31
+		$params = $this->get('aimeos_page')->getSections('account-index');
32
+		return $this->render('AimeosShopBundle:Account:index.html.twig', $params)->setPrivate()->setMaxAge(300);
33 33
 	}
34 34
 
35 35
 
@@ -43,15 +43,15 @@  discard block
 block discarded – undo
43 43
 		$context = $this->container->get('aimeos_context')->get();
44 44
 		$langid = $context->getLocale()->getLanguageId();
45 45
 
46
-		$view = $this->container->get('aimeos_view')->create( $context, array(), $langid );
47
-		$context->setView( $view );
46
+		$view = $this->container->get('aimeos_view')->create($context, array(), $langid);
47
+		$context->setView($view);
48 48
 
49
-		$client = \Aimeos\Client\Html::create( $context, 'account/download' );
50
-		$client->setView( $view );
49
+		$client = \Aimeos\Client\Html::create($context, 'account/download');
50
+		$client->setView($view);
51 51
 		$client->process();
52 52
 
53 53
 		$response = $view->response();
54
-		return Response::create( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() );
54
+		return Response::create((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders());
55 55
 	}
56 56
 
57 57
 
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 	 */
63 63
 	public function favoriteComponentAction()
64 64
 	{
65
-		return $this->getOutput( 'account/favorite' );
65
+		return $this->getOutput('account/favorite');
66 66
 	}
67 67
 
68 68
 
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 	 */
74 74
 	public function historyComponentAction()
75 75
 	{
76
-		return $this->getOutput( 'account/history' );
76
+		return $this->getOutput('account/history');
77 77
 	}
78 78
 
79 79
 
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 	 */
85 85
 	public function profileComponentAction()
86 86
 	{
87
-		return $this->getOutput( 'account/profile' );
87
+		return $this->getOutput('account/profile');
88 88
 	}
89 89
 
90 90
 
@@ -95,6 +95,6 @@  discard block
 block discarded – undo
95 95
 	 */
96 96
 	public function watchComponentAction()
97 97
 	{
98
-		return $this->getOutput( 'account/watch' );
98
+		return $this->getOutput('account/watch');
99 99
 	}
100 100
 }
Please login to merge, or discard this patch.
Command/AccountCommand.php 1 patch
Spacing   +77 added lines, -77 removed lines patch added patch discarded remove patch
@@ -32,14 +32,14 @@  discard block
 block discarded – undo
32 32
 	 */
33 33
 	protected function configure()
34 34
 	{
35
-		$this->setName( self::$defaultName );
36
-		$this->setDescription( 'Creates new (admin) accounts' );
37
-		$this->addArgument( 'email', InputArgument::REQUIRED, 'E-mail address of the account that should be created' );
38
-		$this->addArgument( 'site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default"', 'default' );
39
-		$this->addOption( 'password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)' );
40
-		$this->addOption( 'super', null, InputOption::VALUE_NONE, 'If account should have super user privileges' );
41
-		$this->addOption( 'admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges' );
42
-		$this->addOption( 'editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges' );
35
+		$this->setName(self::$defaultName);
36
+		$this->setDescription('Creates new (admin) accounts');
37
+		$this->addArgument('email', InputArgument::REQUIRED, 'E-mail address of the account that should be created');
38
+		$this->addArgument('site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default"', 'default');
39
+		$this->addOption('password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)');
40
+		$this->addOption('super', null, InputOption::VALUE_NONE, 'If account should have super user privileges');
41
+		$this->addOption('admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges');
42
+		$this->addOption('editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges');
43 43
 	}
44 44
 
45 45
 
@@ -49,54 +49,54 @@  discard block
 block discarded – undo
49 49
 	 * @param InputInterface $input Input object
50 50
 	 * @param OutputInterface $output Output object
51 51
 	 */
52
-	protected function execute( InputInterface $input, OutputInterface $output )
52
+	protected function execute(InputInterface $input, OutputInterface $output)
53 53
 	{
54
-		$code = $input->getArgument( 'email' );
55
-		if( ( $password = $input->getOption( 'password' ) ) === null )
54
+		$code = $input->getArgument('email');
55
+		if (($password = $input->getOption('password')) === null)
56 56
 		{
57
-			$helper = $this->getHelper( 'question' );
58
-			$question = new Question( 'Password' );
59
-			$question->setHidden( true );
57
+			$helper = $this->getHelper('question');
58
+			$question = new Question('Password');
59
+			$question->setHidden(true);
60 60
 
61
-			$password = $helper->ask( $input, $output, $question );
61
+			$password = $helper->ask($input, $output, $question);
62 62
 		}
63 63
 
64
-		$context = $this->getContainer()->get( 'aimeos_context' )->get( false, 'command' );
65
-		$context->setEditor( 'aimeos:account' );
64
+		$context = $this->getContainer()->get('aimeos_context')->get(false, 'command');
65
+		$context->setEditor('aimeos:account');
66 66
 
67
-		$localeManager = \Aimeos\MShop::create( $context, 'locale' );
68
-		$localeItem = $localeManager->bootstrap( $input->getArgument( 'site' ), '', '', false );
69
-		$context->setLocale( $localeItem );
67
+		$localeManager = \Aimeos\MShop::create($context, 'locale');
68
+		$localeItem = $localeManager->bootstrap($input->getArgument('site'), '', '', false);
69
+		$context->setLocale($localeItem);
70 70
 
71
-		$user = $this->createCustomerItem( $context, $code, $password );
71
+		$user = $this->createCustomerItem($context, $code, $password);
72 72
 
73
-		if( $input->getOption( 'admin' ) ) {
74
-			$this->addGroup( $input, $output, $context, $user, 'admin' );
73
+		if ($input->getOption('admin')) {
74
+			$this->addGroup($input, $output, $context, $user, 'admin');
75 75
 		}
76 76
 
77
-		if( $input->getOption( 'editor' ) ) {
78
-			$this->addGroup( $input, $output, $context, $user, 'editor' );
77
+		if ($input->getOption('editor')) {
78
+			$this->addGroup($input, $output, $context, $user, 'editor');
79 79
 		}
80 80
 
81
-		if( $this->getContainer()->has( 'fos_user.user_manager' ) )
81
+		if ($this->getContainer()->has('fos_user.user_manager'))
82 82
 		{
83
-			$userManager = $this->getContainer()->get( 'fos_user.user_manager' );
83
+			$userManager = $this->getContainer()->get('fos_user.user_manager');
84 84
 
85
-			if( ( $fosUser = $userManager->findUserByUsername( $code ) ) === null ) {
86
-				throw new \RuntimeException( 'No user created' );
85
+			if (($fosUser = $userManager->findUserByUsername($code)) === null) {
86
+				throw new \RuntimeException('No user created');
87 87
 			}
88 88
 
89
-			$fosUser->setSuperAdmin( false );
89
+			$fosUser->setSuperAdmin(false);
90 90
 
91
-			if( $input->getOption( 'super' ) ) {
92
-				$fosUser->setSuperAdmin( true );
91
+			if ($input->getOption('super')) {
92
+				$fosUser->setSuperAdmin(true);
93 93
 			}
94 94
 
95
-			if( $input->getOption( 'admin' ) || $input->getOption( 'editor' ) ) {
96
-				$fosUser->addRole( 'ROLE_ADMIN' );
95
+			if ($input->getOption('admin') || $input->getOption('editor')) {
96
+				$fosUser->addRole('ROLE_ADMIN');
97 97
 			}
98 98
 
99
-			$userManager->updateUser( $fosUser );
99
+			$userManager->updateUser($fosUser);
100 100
 		}
101 101
 	}
102 102
 
@@ -110,24 +110,24 @@  discard block
 block discarded – undo
110 110
 	 * @param \Aimeos\MShop\Customer\Item\Iface $user Aimeos customer object
111 111
 	 * @param string $group Unique customer group code
112 112
 	 */
113
-	protected function addGroup( InputInterface $input, OutputInterface $output,
114
-		\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group )
113
+	protected function addGroup(InputInterface $input, OutputInterface $output,
114
+		\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group)
115 115
 	{
116
-		$output->writeln( sprintf( 'Add "%1$s" group to user "%2$s" for sites', $group, $user->getCode() ) );
116
+		$output->writeln(sprintf('Add "%1$s" group to user "%2$s" for sites', $group, $user->getCode()));
117 117
 
118
-		$localeManager = \Aimeos\MShop::create( $context, 'locale' );
118
+		$localeManager = \Aimeos\MShop::create($context, 'locale');
119 119
 
120
-		foreach( $this->getSiteItems( $context, $input ) as $siteItem )
120
+		foreach ($this->getSiteItems($context, $input) as $siteItem)
121 121
 		{
122
-			$localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );
122
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
123 123
 
124 124
 			$lcontext = clone $context;
125
-			$lcontext->setLocale( $localeItem );
125
+			$lcontext->setLocale($localeItem);
126 126
 
127
-			$output->writeln( '- ' . $siteItem->getCode() );
127
+			$output->writeln('- '.$siteItem->getCode());
128 128
 
129
-			$groupItem = $this->getGroupItem( $lcontext, $group );
130
-			$this->addListItem( $lcontext, $user->getId(), $groupItem->getId() );
129
+			$groupItem = $this->getGroupItem($lcontext, $group);
130
+			$this->addListItem($lcontext, $user->getId(), $groupItem->getId());
131 131
 		}
132 132
 	}
133 133
 
@@ -139,30 +139,30 @@  discard block
 block discarded – undo
139 139
 	 * @param string $userid Unique user ID
140 140
 	 * @param string $groupid Unique group ID
141 141
 	 */
142
-	protected function addListItem( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid )
142
+	protected function addListItem(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid)
143 143
 	{
144
-		$manager = \Aimeos\MShop::create( $context, 'customer/lists' );
144
+		$manager = \Aimeos\MShop::create($context, 'customer/lists');
145 145
 
146 146
 		$search = $manager->createSearch();
147 147
 		$expr = array(
148
-			$search->compare( '==', 'customer.lists.parentid', $userid ),
149
-			$search->compare( '==', 'customer.lists.refid', $groupid ),
150
-			$search->compare( '==', 'customer.lists.type', 'default' ),
151
-			$search->compare( '==', 'customer.lists.domain', 'customer/group' ),
148
+			$search->compare('==', 'customer.lists.parentid', $userid),
149
+			$search->compare('==', 'customer.lists.refid', $groupid),
150
+			$search->compare('==', 'customer.lists.type', 'default'),
151
+			$search->compare('==', 'customer.lists.domain', 'customer/group'),
152 152
 		);
153
-		$search->setConditions( $search->combine( '&&', $expr ) );
154
-		$search->setSlice( 0, 1 );
153
+		$search->setConditions($search->combine('&&', $expr));
154
+		$search->setSlice(0, 1);
155 155
 
156
-		if( count( $manager->searchItems( $search ) ) === 0 )
156
+		if (count($manager->searchItems($search)) === 0)
157 157
 		{
158 158
 			$item = $manager->createItem();
159
-			$item->setDomain( 'customer/group' );
160
-			$item->setParentId( $userid );
161
-			$item->setRefId( $groupid );
162
-			$item->setType( 'default' );
163
-			$item->setStatus( 1 );
159
+			$item->setDomain('customer/group');
160
+			$item->setParentId($userid);
161
+			$item->setRefId($groupid);
162
+			$item->setType('default');
163
+			$item->setStatus(1);
164 164
 
165
-			$manager->saveItem( $item, false );
165
+			$manager->saveItem($item, false);
166 166
 		}
167 167
 	}
168 168
 
@@ -177,23 +177,23 @@  discard block
 block discarded – undo
177 177
 	 * @param string $password New user password
178 178
 	 * @return \Aimeos\MShop\Customer\Item\Iface Aimeos customer item object
179 179
 	 */
180
-	protected function createCustomerItem( \Aimeos\MShop\Context\Item\Iface $context, $email, $password )
180
+	protected function createCustomerItem(\Aimeos\MShop\Context\Item\Iface $context, $email, $password)
181 181
 	{
182
-		$manager = \Aimeos\MShop::create( $context, 'customer' );
182
+		$manager = \Aimeos\MShop::create($context, 'customer');
183 183
 
184 184
 		try {
185
-			$item = $manager->findItem( $email );
186
-		} catch( \Aimeos\MShop\Exception $e ) {
185
+			$item = $manager->findItem($email);
186
+		} catch (\Aimeos\MShop\Exception $e) {
187 187
 			$item = $manager->createItem();
188 188
 		}
189 189
 
190
-		$item->setCode( $email );
191
-		$item->setLabel( $email );
192
-		$item->getPaymentAddress()->setEmail( $email );
193
-		$item->setPassword( $password );
194
-		$item->setStatus( 1 );
190
+		$item->setCode($email);
191
+		$item->setLabel($email);
192
+		$item->getPaymentAddress()->setEmail($email);
193
+		$item->setPassword($password);
194
+		$item->setStatus(1);
195 195
 
196
-		$manager->saveItem( $item );
196
+		$manager->saveItem($item);
197 197
 
198 198
 		return $item;
199 199
 	}
@@ -206,21 +206,21 @@  discard block
 block discarded – undo
206 206
 	 * @param string $code Unique customer group code
207 207
 	 * @return \Aimeos\MShop\Customer\Item\Group\Iface Aimeos customer group item object
208 208
 	 */
209
-	protected function getGroupItem( \Aimeos\MShop\Context\Item\Iface $context, $code )
209
+	protected function getGroupItem(\Aimeos\MShop\Context\Item\Iface $context, $code)
210 210
 	{
211
-		$manager = \Aimeos\MShop::create( $context, 'customer/group' );
211
+		$manager = \Aimeos\MShop::create($context, 'customer/group');
212 212
 
213 213
 		try
214 214
 		{
215
-			$item = $manager->findItem( $code );
215
+			$item = $manager->findItem($code);
216 216
 		}
217
-		catch( \Aimeos\MShop\Exception $e )
217
+		catch (\Aimeos\MShop\Exception $e)
218 218
 		{
219 219
 			$item = $manager->createItem();
220
-			$item->setLabel( $code );
221
-			$item->setCode( $code );
220
+			$item->setLabel($code);
221
+			$item->setCode($code);
222 222
 
223
-			$manager->saveItem( $item );
223
+			$manager->saveItem($item);
224 224
 		}
225 225
 
226 226
 		return $item;
Please login to merge, or discard this patch.
Command/JobsCommand.php 1 patch
Spacing   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -32,19 +32,19 @@  discard block
 block discarded – undo
32 32
 	protected function configure()
33 33
 	{
34 34
 		$names = '';
35
-		$aimeos = new \Aimeos\Bootstrap( array() );
36
-		$cntlPaths = $aimeos->getCustomPaths( 'controller/jobs' );
37
-		$controllers = \Aimeos\Controller\Jobs::get( $this->getBareContext(), $aimeos, $cntlPaths );
35
+		$aimeos = new \Aimeos\Bootstrap(array());
36
+		$cntlPaths = $aimeos->getCustomPaths('controller/jobs');
37
+		$controllers = \Aimeos\Controller\Jobs::get($this->getBareContext(), $aimeos, $cntlPaths);
38 38
 
39
-		foreach( $controllers as $key => $controller ) {
40
-			$names .= str_pad( $key, 30 ) . $controller->getName() . PHP_EOL;
39
+		foreach ($controllers as $key => $controller) {
40
+			$names .= str_pad($key, 30).$controller->getName().PHP_EOL;
41 41
 		}
42 42
 
43
-		$this->setName( self::$defaultName );
44
-		$this->setDescription( 'Executes the job controllers' );
45
-		$this->addArgument( 'jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"' );
46
-		$this->addArgument( 'site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)' );
47
-		$this->setHelp( "Available jobs are:\n" . $names );
43
+		$this->setName(self::$defaultName);
44
+		$this->setDescription('Executes the job controllers');
45
+		$this->addArgument('jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"');
46
+		$this->addArgument('site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)');
47
+		$this->setHelp("Available jobs are:\n".$names);
48 48
 	}
49 49
 
50 50
 
@@ -54,32 +54,32 @@  discard block
 block discarded – undo
54 54
 	 * @param InputInterface $input Input object
55 55
 	 * @param OutputInterface $output Output object
56 56
 	 */
57
-	protected function execute( InputInterface $input, OutputInterface $output )
57
+	protected function execute(InputInterface $input, OutputInterface $output)
58 58
 	{
59 59
 		$context = $this->getContext();
60 60
 		$process = $context->getProcess();
61
-		$aimeos = $this->getContainer()->get( 'aimeos' )->get();
61
+		$aimeos = $this->getContainer()->get('aimeos')->get();
62 62
 
63
-		$jobs = explode( ' ', $input->getArgument( 'jobs' ) );
64
-		$localeManager = \Aimeos\MShop::create( $context, 'locale' );
63
+		$jobs = explode(' ', $input->getArgument('jobs'));
64
+		$localeManager = \Aimeos\MShop::create($context, 'locale');
65 65
 
66
-		foreach( $this->getSiteItems( $context, $input ) as $siteItem )
66
+		foreach ($this->getSiteItems($context, $input) as $siteItem)
67 67
 		{
68
-			$localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );
69
-			$localeItem->setLanguageId( null );
70
-			$localeItem->setCurrencyId( null );
68
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
69
+			$localeItem->setLanguageId(null);
70
+			$localeItem->setCurrencyId(null);
71 71
 
72
-			$context->setLocale( $localeItem );
72
+			$context->setLocale($localeItem);
73 73
 
74
-			$output->writeln( sprintf( 'Executing the Aimeos jobs for "<info>%s</info>"', $siteItem->getCode() ) );
74
+			$output->writeln(sprintf('Executing the Aimeos jobs for "<info>%s</info>"', $siteItem->getCode()));
75 75
 
76
-			foreach( $jobs as $jobname )
76
+			foreach ($jobs as $jobname)
77 77
 			{
78
-				$fcn = function( $context, $aimeos, $jobname ) {
79
-					\Aimeos\Controller\Jobs::create( $context, $aimeos, $jobname )->run();
78
+				$fcn = function($context, $aimeos, $jobname) {
79
+					\Aimeos\Controller\Jobs::create($context, $aimeos, $jobname)->run();
80 80
 				};
81 81
 
82
-				$process->start( $fcn, [$context, $aimeos, $jobname], true );
82
+				$process->start($fcn, [$context, $aimeos, $jobname], true);
83 83
 			}
84 84
 		}
85 85
 
@@ -96,15 +96,15 @@  discard block
 block discarded – undo
96 96
 	{
97 97
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
98 98
 
99
-		$conf = new \Aimeos\MW\Config\PHPArray( array(), array() );
100
-		$ctx->setConfig( $conf );
99
+		$conf = new \Aimeos\MW\Config\PHPArray(array(), array());
100
+		$ctx->setConfig($conf);
101 101
 
102
-		$locale = \Aimeos\MShop::create( $ctx, 'locale' )->createItem();
103
-		$locale->setLanguageId( 'en' );
104
-		$ctx->setLocale( $locale );
102
+		$locale = \Aimeos\MShop::create($ctx, 'locale')->createItem();
103
+		$locale->setLanguageId('en');
104
+		$ctx->setLocale($locale);
105 105
 
106
-		$i18n = new \Aimeos\MW\Translation\None( 'en' );
107
-		$ctx->setI18n( array( 'en' => $i18n ) );
106
+		$i18n = new \Aimeos\MW\Translation\None('en');
107
+		$ctx->setI18n(array('en' => $i18n));
108 108
 
109 109
 		return $ctx;
110 110
 	}
@@ -119,19 +119,19 @@  discard block
 block discarded – undo
119 119
 	{
120 120
 		$container = $this->getContainer();
121 121
 		$aimeos = $container->get('aimeos')->get();
122
-		$context = $container->get( 'aimeos_context' )->get( false, 'command' );
122
+		$context = $container->get('aimeos_context')->get(false, 'command');
123 123
 
124
-		$tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' );
125
-		$tmplPaths = array_merge( $tmplPaths, $aimeos->getCustomPaths( 'client/html/templates' ) );
126
-		$view = $container->get('aimeos_view')->create( $context, $tmplPaths );
124
+		$tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates');
125
+		$tmplPaths = array_merge($tmplPaths, $aimeos->getCustomPaths('client/html/templates'));
126
+		$view = $container->get('aimeos_view')->create($context, $tmplPaths);
127 127
 
128
-		$langManager = \Aimeos\MShop::create( $context, 'locale/language' );
129
-		$langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) );
130
-		$i18n = $this->getContainer()->get( 'aimeos_i18n' )->get( $langids );
128
+		$langManager = \Aimeos\MShop::create($context, 'locale/language');
129
+		$langids = array_keys($langManager->searchItems($langManager->createSearch(true)));
130
+		$i18n = $this->getContainer()->get('aimeos_i18n')->get($langids);
131 131
 
132
-		$context->setEditor( 'aimeos:jobs' );
133
-		$context->setView( $view );
134
-		$context->setI18n( $i18n );
132
+		$context->setEditor('aimeos:jobs');
133
+		$context->setView($view);
134
+		$context->setI18n($i18n);
135 135
 
136 136
 		return $context;
137 137
 	}
Please login to merge, or discard this patch.
Command/CacheCommand.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -31,9 +31,9 @@  discard block
 block discarded – undo
31 31
 	 */
32 32
 	protected function configure()
33 33
 	{
34
-		$this->setName( self::$defaultName );
35
-		$this->setDescription( 'Clears the content cache' );
36
-		$this->addArgument( 'site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)' );
34
+		$this->setName(self::$defaultName);
35
+		$this->setDescription('Clears the content cache');
36
+		$this->addArgument('site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)');
37 37
 	}
38 38
 
39 39
 
@@ -43,26 +43,26 @@  discard block
 block discarded – undo
43 43
 	 * @param InputInterface $input Input object
44 44
 	 * @param OutputInterface $output Output object
45 45
 	 */
46
-	protected function execute( InputInterface $input, OutputInterface $output )
46
+	protected function execute(InputInterface $input, OutputInterface $output)
47 47
 	{
48
-		$context = $this->getContainer()->get( 'aimeos_context' )->get( false, 'command' );
49
-		$context->setEditor( 'aimeos:cache' );
48
+		$context = $this->getContainer()->get('aimeos_context')->get(false, 'command');
49
+		$context->setEditor('aimeos:cache');
50 50
 
51
-		$localeManager = \Aimeos\MShop::create( $context, 'locale' );
51
+		$localeManager = \Aimeos\MShop::create($context, 'locale');
52 52
 
53
-		foreach( $this->getSiteItems( $context, $input ) as $siteItem )
53
+		foreach ($this->getSiteItems($context, $input) as $siteItem)
54 54
 		{
55
-			$localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );
55
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
56 56
 
57 57
 			$lcontext = clone $context;
58
-			$lcontext->setLocale( $localeItem );
58
+			$lcontext->setLocale($localeItem);
59 59
 
60
-			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext );
61
-			$lcontext->setCache( $cache );
60
+			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext);
61
+			$lcontext->setCache($cache);
62 62
 
63
-			$output->writeln( sprintf( 'Clearing the Aimeos cache for site <info>%1$s</info>', $siteItem->getCode() ) );
63
+			$output->writeln(sprintf('Clearing the Aimeos cache for site <info>%1$s</info>', $siteItem->getCode()));
64 64
 
65
-			\Aimeos\MAdmin::create( $lcontext, 'cache' )->getCache()->clear();
65
+			\Aimeos\MAdmin::create($lcontext, 'cache')->getCache()->clear();
66 66
 		}
67 67
 	}
68 68
 }
Please login to merge, or discard this patch.
Command/Command.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -30,15 +30,15 @@
 block discarded – undo
30 30
 	 * @param InputInterface $input Input object
31 31
 	 * @return \Aimeos\MShop\Locale\Item\Site\Interface[] List of site items
32 32
 	 */
33
-	protected function getSiteItems( \Aimeos\MShop\Context\Item\Iface $context, InputInterface $input )
33
+	protected function getSiteItems(\Aimeos\MShop\Context\Item\Iface $context, InputInterface $input)
34 34
 	{
35
-		$manager = \Aimeos\MShop::create( $context, 'locale/site' );
35
+		$manager = \Aimeos\MShop::create($context, 'locale/site');
36 36
 		$search = $manager->createSearch();
37 37
 
38
-		if( ( $codes = (string) $input->getArgument( 'site' ) ) !== '' ) {
39
-			$search->setConditions( $search->compare( '==', 'locale.site.code', explode( ' ', $codes ) ) );
38
+		if (($codes = (string) $input->getArgument('site')) !== '') {
39
+			$search->setConditions($search->compare('==', 'locale.site.code', explode(' ', $codes)));
40 40
 		}
41 41
 
42
-		return $manager->searchItems( $search );
42
+		return $manager->searchItems($search);
43 43
 	}
44 44
 }
Please login to merge, or discard this patch.
Tests/Controller/JqadmControllerTest.php 1 patch
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -12,12 +12,12 @@  discard block
 block discarded – undo
12 12
 		$client = static::createClient(array(), array(
13 13
 			'PHP_AUTH_USER' => 'admin',
14 14
 			'PHP_AUTH_PW'   => 'adminpass',
15
-		) );
15
+		));
16 16
 
17
-		$client->request( 'GET', '/unittest/jqadm/file/css' );
17
+		$client->request('GET', '/unittest/jqadm/file/css');
18 18
 
19
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
20
-		$this->assertContains( '.aimeos', $client->getResponse()->getContent() );
19
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
20
+		$this->assertContains('.aimeos', $client->getResponse()->getContent());
21 21
 	}
22 22
 
23 23
 
@@ -26,12 +26,12 @@  discard block
 block discarded – undo
26 26
 		$client = static::createClient(array(), array(
27 27
 			'PHP_AUTH_USER' => 'admin',
28 28
 			'PHP_AUTH_PW'   => 'adminpass',
29
-		) );
29
+		));
30 30
 
31
-		$client->request( 'GET', '/unittest/jqadm/file/js' );
31
+		$client->request('GET', '/unittest/jqadm/file/js');
32 32
 
33
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
34
-		$this->assertContains( 'Aimeos = {', $client->getResponse()->getContent() );
33
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
34
+		$this->assertContains('Aimeos = {', $client->getResponse()->getContent());
35 35
 	}
36 36
 
37 37
 
@@ -40,13 +40,13 @@  discard block
 block discarded – undo
40 40
 		$client = static::createClient(array(), array(
41 41
 			'PHP_AUTH_USER' => 'admin',
42 42
 			'PHP_AUTH_PW'   => 'adminpass',
43
-		) );
43
+		));
44 44
 
45
-		$client->request( 'GET', '/unittest/jqadm/copy/product/1' );
45
+		$client->request('GET', '/unittest/jqadm/copy/product/1');
46 46
 		$response = $client->getResponse();
47 47
 
48
-		$this->assertEquals( 200, $response->getStatusCode() );
49
-		$this->assertContains( 'item-product', $response->getContent() );
48
+		$this->assertEquals(200, $response->getStatusCode());
49
+		$this->assertContains('item-product', $response->getContent());
50 50
 	}
51 51
 
52 52
 
@@ -55,13 +55,13 @@  discard block
 block discarded – undo
55 55
 		$client = static::createClient(array(), array(
56 56
 			'PHP_AUTH_USER' => 'admin',
57 57
 			'PHP_AUTH_PW'   => 'adminpass',
58
-		) );
58
+		));
59 59
 
60
-		$client->request( 'GET', '/unittest/jqadm/create/product' );
60
+		$client->request('GET', '/unittest/jqadm/create/product');
61 61
 		$response = $client->getResponse();
62 62
 
63
-		$this->assertEquals( 200, $response->getStatusCode() );
64
-		$this->assertContains( 'item-product', $response->getContent() );
63
+		$this->assertEquals(200, $response->getStatusCode());
64
+		$this->assertContains('item-product', $response->getContent());
65 65
 	}
66 66
 
67 67
 
@@ -70,13 +70,13 @@  discard block
 block discarded – undo
70 70
 		$client = static::createClient(array(), array(
71 71
 			'PHP_AUTH_USER' => 'admin',
72 72
 			'PHP_AUTH_PW'   => 'adminpass',
73
-		) );
73
+		));
74 74
 
75
-		$client->request( 'GET', '/unittest/jqadm/delete/product/0' );
75
+		$client->request('GET', '/unittest/jqadm/delete/product/0');
76 76
 		$response = $client->getResponse();
77 77
 
78
-		$this->assertEquals( 200, $response->getStatusCode() );
79
-		$this->assertContains( 'list-items', $response->getContent() );
78
+		$this->assertEquals(200, $response->getStatusCode());
79
+		$this->assertContains('list-items', $response->getContent());
80 80
 	}
81 81
 
82 82
 
@@ -85,13 +85,13 @@  discard block
 block discarded – undo
85 85
 		$client = static::createClient(array(), array(
86 86
 			'PHP_AUTH_USER' => 'admin',
87 87
 			'PHP_AUTH_PW'   => 'adminpass',
88
-		) );
88
+		));
89 89
 
90
-		$client->request( 'GET', '/unittest/jqadm/export/order' );
90
+		$client->request('GET', '/unittest/jqadm/export/order');
91 91
 		$response = $client->getResponse();
92 92
 
93
-		$this->assertEquals( 200, $response->getStatusCode() );
94
-		$this->assertContains( 'list-items', $response->getContent() );
93
+		$this->assertEquals(200, $response->getStatusCode());
94
+		$this->assertContains('list-items', $response->getContent());
95 95
 	}
96 96
 
97 97
 
@@ -100,13 +100,13 @@  discard block
 block discarded – undo
100 100
 		$client = static::createClient(array(), array(
101 101
 			'PHP_AUTH_USER' => 'admin',
102 102
 			'PHP_AUTH_PW'   => 'adminpass',
103
-		) );
103
+		));
104 104
 
105
-		$client->request( 'GET', '/unittest/jqadm/get/product/1' );
105
+		$client->request('GET', '/unittest/jqadm/get/product/1');
106 106
 		$response = $client->getResponse();
107 107
 
108
-		$this->assertEquals( 200, $response->getStatusCode() );
109
-		$this->assertContains( 'item-product', $response->getContent() );
108
+		$this->assertEquals(200, $response->getStatusCode());
109
+		$this->assertContains('item-product', $response->getContent());
110 110
 	}
111 111
 
112 112
 
@@ -115,13 +115,13 @@  discard block
 block discarded – undo
115 115
 		$client = static::createClient(array(), array(
116 116
 			'PHP_AUTH_USER' => 'admin',
117 117
 			'PHP_AUTH_PW'   => 'adminpass',
118
-		) );
118
+		));
119 119
 
120
-		$client->request( 'POST', '/unittest/jqadm/save/product' );
120
+		$client->request('POST', '/unittest/jqadm/save/product');
121 121
 		$response = $client->getResponse();
122 122
 
123
-		$this->assertEquals( 200, $response->getStatusCode() );
124
-		$this->assertContains( 'item-product', $response->getContent() );
123
+		$this->assertEquals(200, $response->getStatusCode());
124
+		$this->assertContains('item-product', $response->getContent());
125 125
 	}
126 126
 
127 127
 
@@ -130,13 +130,13 @@  discard block
 block discarded – undo
130 130
 		$client = static::createClient(array(), array(
131 131
 			'PHP_AUTH_USER' => 'admin',
132 132
 			'PHP_AUTH_PW'   => 'adminpass',
133
-		) );
133
+		));
134 134
 
135
-		$client->request( 'GET', '/unittest/jqadm/search/product' );
135
+		$client->request('GET', '/unittest/jqadm/search/product');
136 136
 		$response = $client->getResponse();
137 137
 
138
-		$this->assertEquals( 200, $response->getStatusCode() );
139
-		$this->assertContains( 'list-items', $response->getContent() );
138
+		$this->assertEquals(200, $response->getStatusCode());
139
+		$this->assertContains('list-items', $response->getContent());
140 140
 	}
141 141
 
142 142
 
@@ -145,11 +145,11 @@  discard block
 block discarded – undo
145 145
 		$client = static::createClient(array(), array(
146 146
 			'PHP_AUTH_USER' => 'admin',
147 147
 			'PHP_AUTH_PW'   => 'adminpass',
148
-		) );
148
+		));
149 149
 
150
-		$client->request( 'GET', '/invalid/jqadm/search/product' );
150
+		$client->request('GET', '/invalid/jqadm/search/product');
151 151
 		$response = $client->getResponse();
152 152
 
153
-		$this->assertEquals( 500, $response->getStatusCode() );
153
+		$this->assertEquals(500, $response->getStatusCode());
154 154
 	}
155 155
 }
Please login to merge, or discard this patch.