Completed
Push — master ( 0c9e6f...a5730c )
by Aimeos
19:58
created
Tests/Controller/AdminControllerTest.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -11,11 +11,11 @@  discard block
 block discarded – undo
11 11
 	{
12 12
 		$client = static::createClient();
13 13
 
14
-		$client->request( 'GET', '/admin' );
14
+		$client->request('GET', '/admin');
15 15
 		$response = $client->getResponse();
16 16
 
17
-		$this->assertEquals( 200, $response->getStatusCode() );
18
-		$this->assertContains( '<form class="login"', $response->getContent() );
17
+		$this->assertEquals(200, $response->getStatusCode());
18
+		$this->assertContains('<form class="login"', $response->getContent());
19 19
 	}
20 20
 
21 21
 
@@ -24,12 +24,12 @@  discard block
 block discarded – undo
24 24
 		$client = static::createClient(array(), array(
25 25
 			'PHP_AUTH_USER' => 'admin',
26 26
 			'PHP_AUTH_PW'   => 'adminpass',
27
-		) );
27
+		));
28 28
 
29
-		$client->request( 'GET', '/admin' );
29
+		$client->request('GET', '/admin');
30 30
 		$response = $client->getResponse();
31 31
 
32
-		$this->assertEquals( 302, $response->getStatusCode() );
33
-		$this->assertContains( '/default/jqadm/search/dashboard?lang=en', $response->getContent() );
32
+		$this->assertEquals(302, $response->getStatusCode());
33
+		$this->assertContains('/default/jqadm/search/dashboard?lang=en', $response->getContent());
34 34
 	}
35 35
 }
Please login to merge, or discard this patch.
Controller/AdminController.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -29,23 +29,23 @@  discard block
 block discarded – undo
29 29
 	 */
30 30
 	public function indexAction()
31 31
 	{
32
-		if( $this->isAdmin() )
32
+		if ($this->isAdmin())
33 33
 		{
34
-			$params = array( 'site' => 'default', 'resource' => 'dashboard', 'lang' => 'en' );
35
-			return $this->redirect( $this->generateUrl( 'aimeos_shop_jqadm_search', $params ) );
34
+			$params = array('site' => 'default', 'resource' => 'dashboard', 'lang' => 'en');
35
+			return $this->redirect($this->generateUrl('aimeos_shop_jqadm_search', $params));
36 36
 		}
37 37
 
38
-		$param = array( 'error' => '', 'username' => '' );
38
+		$param = array('error' => '', 'username' => '');
39 39
 
40
-		if( $this->has( 'security.authentication_utils' ) )
40
+		if ($this->has('security.authentication_utils'))
41 41
 		{
42
-			$auth = $this->get( 'security.authentication_utils' );
42
+			$auth = $this->get('security.authentication_utils');
43 43
 
44 44
 			$param['error'] = $auth->getLastAuthenticationError();
45 45
 			$param['username'] = $auth->getLastUsername();
46 46
 		}
47 47
 
48
-		return $this->render( 'AimeosShopBundle:Admin:index.html.twig', $param );
48
+		return $this->render('AimeosShopBundle:Admin:index.html.twig', $param);
49 49
 	}
50 50
 
51 51
 
@@ -56,10 +56,10 @@  discard block
 block discarded – undo
56 56
 	 */
57 57
 	protected function isAdmin()
58 58
 	{
59
-		if( $this->has( 'security.authorization_checker' ) && $this->get( 'security.token_storage' )->getToken()
60
-			&& $this->get( 'security.authorization_checker' )->isGranted( 'ROLE_ADMIN' )
61
-			|| $this->has( 'security.context' ) && $this->get( 'security.context' )->getToken()
62
-			&& $this->get( 'security.context' )->isGranted( 'ROLE_ADMIN' )
59
+		if ($this->has('security.authorization_checker') && $this->get('security.token_storage')->getToken()
60
+			&& $this->get('security.authorization_checker')->isGranted('ROLE_ADMIN')
61
+			|| $this->has('security.context') && $this->get('security.context')->getToken()
62
+			&& $this->get('security.context')->isGranted('ROLE_ADMIN')
63 63
 		) {
64 64
 			return true;
65 65
 		}
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 );
31
+		$params = $this->get('aimeos_page')->getSections('account-index');
32
+		return $this->render('AimeosShopBundle:Account:index.html.twig', $params);
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\Factory::createClient( $context, array(), 'account/download' );
50
-		$client->setView( $view );
49
+		$client = \Aimeos\Client\Html\Factory::createClient($context, array(), 'account/download');
50
+		$client->setView($view);
51 51
 		$client->process();
52 52
 
53 53
 		$response = $view->response();
54
-		return new Response( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() );
54
+		return new Response((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.
Tests/Controller/AccountControllerTest.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -10,69 +10,69 @@
 block discarded – undo
10 10
 	public function testAccount()
11 11
 	{
12 12
 		$client = static::createClient();
13
-		$client->request( 'GET', '/unittest/de/EUR/myaccount' );
13
+		$client->request('GET', '/unittest/de/EUR/myaccount');
14 14
 
15
-		$this->assertContains( 'aimeos account-profile', $client->getResponse()->getContent() );
16
-		$this->assertContains( 'aimeos account-history', $client->getResponse()->getContent() );
17
-		$this->assertContains( 'aimeos account-favorite', $client->getResponse()->getContent() );
18
-		$this->assertContains( 'aimeos account-watch', $client->getResponse()->getContent() );
15
+		$this->assertContains('aimeos account-profile', $client->getResponse()->getContent());
16
+		$this->assertContains('aimeos account-history', $client->getResponse()->getContent());
17
+		$this->assertContains('aimeos account-favorite', $client->getResponse()->getContent());
18
+		$this->assertContains('aimeos account-watch', $client->getResponse()->getContent());
19 19
 	}
20 20
 
21 21
 
22 22
 	public function testDownload()
23 23
 	{
24 24
 		$client = static::createClient();
25
-		$client->request( 'GET', '/unittest/de/EUR/myaccount/download/0' );
25
+		$client->request('GET', '/unittest/de/EUR/myaccount/download/0');
26 26
 
27
-		$this->assertEquals( 401, $client->getResponse()->getStatusCode() );
27
+		$this->assertEquals(401, $client->getResponse()->getStatusCode());
28 28
 	}
29 29
 
30 30
 
31 31
 	public function testFavoriteComponent()
32 32
 	{
33 33
 		$client = static::createClient();
34
-		$client->request( 'GET', '/unittest/de/EUR/test/favoritecomponent' );
34
+		$client->request('GET', '/unittest/de/EUR/test/favoritecomponent');
35 35
 
36
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
37
-		$this->assertContains( 'aimeos account-favorite', $client->getResponse()->getContent() );
36
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
37
+		$this->assertContains('aimeos account-favorite', $client->getResponse()->getContent());
38 38
 	}
39 39
 
40 40
 
41 41
 	public function testHistoryComponent()
42 42
 	{
43
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\AccountController' )
44
-			->setMethods( array( 'getOutput' ) )
43
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\AccountController')
44
+			->setMethods(array('getOutput'))
45 45
 			->disableOriginalConstructor()
46 46
 			->getMock();
47 47
 
48
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( 'test' ) );
48
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue('test'));
49 49
 
50
-		$this->assertEquals( 'test', $mock->historyComponentAction() );
50
+		$this->assertEquals('test', $mock->historyComponentAction());
51 51
 	}
52 52
 
53 53
 
54 54
 	public function testProfileComponent()
55 55
 	{
56
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\AccountController' )
57
-			->setMethods( array( 'getOutput' ) )
56
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\AccountController')
57
+			->setMethods(array('getOutput'))
58 58
 			->disableOriginalConstructor()
59 59
 			->getMock();
60 60
 
61
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( 'test' ) );
61
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue('test'));
62 62
 
63
-		$this->assertEquals( 'test', $mock->profileComponentAction() );
63
+		$this->assertEquals('test', $mock->profileComponentAction());
64 64
 	}
65 65
 
66 66
 
67 67
 	public function testWatchComponent()
68 68
 	{
69
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\AccountController' )
70
-			->setMethods( array( 'getOutput' ) )
69
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\AccountController')
70
+			->setMethods(array('getOutput'))
71 71
 			->disableOriginalConstructor()
72 72
 			->getMock();
73 73
 
74
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( 'test' ) );
74
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue('test'));
75 75
 
76
-		$this->assertEquals( 'test', $mock->watchComponentAction() );
76
+		$this->assertEquals('test', $mock->watchComponentAction());
77 77
 	}
78 78
 }
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.
Tests/Controller/JqadmControllerTest.php 1 patch
Spacing   +36 added lines, -36 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/0' );
45
+		$client->request('GET', '/unittest/jqadm/copy/product/0');
46 46
 		$response = $client->getResponse();
47 47
 
48
-		$this->assertEquals( 200, $response->getStatusCode() );
49
-		$this->assertContains( '<div class="product-item', $response->getContent() );
48
+		$this->assertEquals(200, $response->getStatusCode());
49
+		$this->assertContains('<div class="product-item', $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( '<div class="product-item', $response->getContent() );
63
+		$this->assertEquals(200, $response->getStatusCode());
64
+		$this->assertContains('<div class="product-item', $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( '<table class="list-items', $response->getContent() );
78
+		$this->assertEquals(200, $response->getStatusCode());
79
+		$this->assertContains('<table class="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/get/product/0' );
90
+		$client->request('GET', '/unittest/jqadm/get/product/0');
91 91
 		$response = $client->getResponse();
92 92
 
93
-		$this->assertEquals( 200, $response->getStatusCode() );
94
-		$this->assertContains( '<div class="product-item', $response->getContent() );
93
+		$this->assertEquals(200, $response->getStatusCode());
94
+		$this->assertContains('<div class="product-item', $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( 'POST', '/unittest/jqadm/save/product/0' );
105
+		$client->request('POST', '/unittest/jqadm/save/product/0');
106 106
 		$response = $client->getResponse();
107 107
 
108
-		$this->assertEquals( 200, $response->getStatusCode() );
109
-		$this->assertContains( '<div class="product-item', $response->getContent() );
108
+		$this->assertEquals(200, $response->getStatusCode());
109
+		$this->assertContains('<div class="product-item', $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( 'GET', '/unittest/jqadm/search/product' );
120
+		$client->request('GET', '/unittest/jqadm/search/product');
121 121
 		$response = $client->getResponse();
122 122
 
123
-		$this->assertEquals( 200, $response->getStatusCode() );
124
-		$this->assertContains( '<table class="list-items', $response->getContent() );
123
+		$this->assertEquals(200, $response->getStatusCode());
124
+		$this->assertContains('<table class="list-items', $response->getContent());
125 125
 	}
126 126
 
127 127
 
@@ -130,12 +130,12 @@  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', '/invalid/jqadm/search/product' );
135
+		$client->request('GET', '/invalid/jqadm/search/product');
136 136
 		$response = $client->getResponse();
137 137
 
138
-		$this->assertEquals( 200, $response->getStatusCode() );
139
-		$this->assertContains( '<table class="list-items', $response->getContent() );
138
+		$this->assertEquals(200, $response->getStatusCode());
139
+		$this->assertContains('<table class="list-items', $response->getContent());
140 140
 	}
141 141
 }
Please login to merge, or discard this patch.
Command/JobsCommand.php 1 patch
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -29,19 +29,19 @@  discard block
 block discarded – undo
29 29
 	protected function configure()
30 30
 	{
31 31
 		$names = '';
32
-		$aimeos = new \Aimeos\Bootstrap( array() );
33
-		$cntlPaths = $aimeos->getCustomPaths( 'controller/jobs' );
34
-		$controllers = \Aimeos\Controller\Jobs\Factory::getControllers( $this->getBareContext(), $aimeos, $cntlPaths );
32
+		$aimeos = new \Aimeos\Bootstrap(array());
33
+		$cntlPaths = $aimeos->getCustomPaths('controller/jobs');
34
+		$controllers = \Aimeos\Controller\Jobs\Factory::getControllers($this->getBareContext(), $aimeos, $cntlPaths);
35 35
 
36
-		foreach( $controllers as $key => $controller ) {
37
-			$names .= str_pad( $key, 30 ) . $controller->getName() . PHP_EOL;
36
+		foreach ($controllers as $key => $controller) {
37
+			$names .= str_pad($key, 30).$controller->getName().PHP_EOL;
38 38
 		}
39 39
 
40
-		$this->setName( 'aimeos:jobs' );
41
-		$this->setDescription( 'Executes the job controllers' );
42
-		$this->addArgument( 'jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"' );
43
-		$this->addArgument( 'site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)' );
44
-		$this->setHelp( "Available jobs are:\n" . $names );
40
+		$this->setName('aimeos:jobs');
41
+		$this->setDescription('Executes the job controllers');
42
+		$this->addArgument('jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"');
43
+		$this->addArgument('site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)');
44
+		$this->setHelp("Available jobs are:\n".$names);
45 45
 	}
46 46
 
47 47
 
@@ -51,26 +51,26 @@  discard block
 block discarded – undo
51 51
 	 * @param InputInterface $input Input object
52 52
 	 * @param OutputInterface $output Output object
53 53
 	 */
54
-	protected function execute( InputInterface $input, OutputInterface $output )
54
+	protected function execute(InputInterface $input, OutputInterface $output)
55 55
 	{
56 56
 		$context = $this->getContext();
57
-		$aimeos = $this->getContainer()->get( 'aimeos' )->get();
57
+		$aimeos = $this->getContainer()->get('aimeos')->get();
58 58
 
59
-		$jobs = explode( ' ', $input->getArgument( 'jobs' ) );
60
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
59
+		$jobs = explode(' ', $input->getArgument('jobs'));
60
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
61 61
 
62
-		foreach( $this->getSiteItems( $context, $input ) as $siteItem )
62
+		foreach ($this->getSiteItems($context, $input) as $siteItem)
63 63
 		{
64
-			$localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );
65
-			$localeItem->setLanguageId( null );
66
-			$localeItem->setCurrencyId( null );
64
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
65
+			$localeItem->setLanguageId(null);
66
+			$localeItem->setCurrencyId(null);
67 67
 
68
-			$context->setLocale( $localeItem );
68
+			$context->setLocale($localeItem);
69 69
 
70
-			$output->writeln( sprintf( 'Executing the Aimeos jobs for "<info>%s</info>"', $siteItem->getCode() ) );
70
+			$output->writeln(sprintf('Executing the Aimeos jobs for "<info>%s</info>"', $siteItem->getCode()));
71 71
 
72
-			foreach( $jobs as $jobname ) {
73
-				\Aimeos\Controller\Jobs\Factory::createController( $context, $aimeos, $jobname )->run();
72
+			foreach ($jobs as $jobname) {
73
+				\Aimeos\Controller\Jobs\Factory::createController($context, $aimeos, $jobname)->run();
74 74
 			}
75 75
 		}
76 76
 	}
@@ -85,15 +85,15 @@  discard block
 block discarded – undo
85 85
 	{
86 86
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
87 87
 
88
-		$conf = new \Aimeos\MW\Config\PHPArray( array(), array() );
89
-		$ctx->setConfig( $conf );
88
+		$conf = new \Aimeos\MW\Config\PHPArray(array(), array());
89
+		$ctx->setConfig($conf);
90 90
 
91
-		$locale = \Aimeos\MShop\Factory::createManager( $ctx, 'locale' )->createItem();
92
-		$locale->setLanguageId( 'en' );
93
-		$ctx->setLocale( $locale );
91
+		$locale = \Aimeos\MShop\Factory::createManager($ctx, 'locale')->createItem();
92
+		$locale->setLanguageId('en');
93
+		$ctx->setLocale($locale);
94 94
 
95
-		$i18n = new \Aimeos\MW\Translation\None( 'en' );
96
-		$ctx->setI18n( array( 'en' => $i18n ) );
95
+		$i18n = new \Aimeos\MW\Translation\None('en');
96
+		$ctx->setI18n(array('en' => $i18n));
97 97
 
98 98
 		return $ctx;
99 99
 	}
@@ -108,19 +108,19 @@  discard block
 block discarded – undo
108 108
 	{
109 109
 		$container = $this->getContainer();
110 110
 		$aimeos = $container->get('aimeos')->get();
111
-		$context = $container->get( 'aimeos_context' )->get( false, 'command' );
111
+		$context = $container->get('aimeos_context')->get(false, 'command');
112 112
 
113
-		$tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' );
114
-		$tmplPaths = array_merge( $tmplPaths, $aimeos->getCustomPaths( 'client/html/templates' ) );
115
-		$view = $container->get('aimeos_view')->create( $context, $tmplPaths );
113
+		$tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates');
114
+		$tmplPaths = array_merge($tmplPaths, $aimeos->getCustomPaths('client/html/templates'));
115
+		$view = $container->get('aimeos_view')->create($context, $tmplPaths);
116 116
 
117
-		$langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context )->getSubManager( 'language' );
118
-		$langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) );
119
-		$i18n = $this->getContainer()->get( 'aimeos_i18n' )->get( $langids );
117
+		$langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context)->getSubManager('language');
118
+		$langids = array_keys($langManager->searchItems($langManager->createSearch(true)));
119
+		$i18n = $this->getContainer()->get('aimeos_i18n')->get($langids);
120 120
 
121
-		$context->setEditor( 'aimeos:jobs' );
122
-		$context->setView( $view );
123
-		$context->setI18n( $i18n );
121
+		$context->setEditor('aimeos:jobs');
122
+		$context->setView($view);
123
+		$context->setI18n($i18n);
124 124
 
125 125
 		return $context;
126 126
 	}
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.