Completed
Push — master ( a20c7e...9ae9b3 )
by Aimeos
02:17
created
src/Command/Iface.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
 	 *
24 24
 	 * @param array $argv Associative array from $_SERVER['argv']
25 25
 	 */
26
-	public static function run( array $argv );
26
+	public static function run(array $argv);
27 27
 
28 28
 	/**
29 29
 	 * Returns the command usage and options
Please login to merge, or discard this patch.
src/Command/Base.php 2 patches
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -24,31 +24,31 @@  discard block
 block discarded – undo
24 24
 	 * @param array &$params List of parameters
25 25
 	 * @return array Associative list of option name and value(s)
26 26
 	 */
27
-	protected static function getOptions( array &$params )
27
+	protected static function getOptions(array &$params)
28 28
 	{
29 29
 		$options = array();
30 30
 
31
-		foreach( $params as $key => $option )
31
+		foreach ($params as $key => $option)
32 32
 		{
33
-			if( $option === '--help' ) {
33
+			if ($option === '--help') {
34 34
 				throw new Exception();
35 35
 			}
36 36
 
37
-			if( strncmp( $option, '--', 2 ) === 0 && ( $pos = strpos( $option, '=', 2 ) ) !== false )
37
+			if (strncmp($option, '--', 2) === 0 && ($pos = strpos($option, '=', 2)) !== false)
38 38
 			{
39
-				$name = substr( $option, 2, $pos - 2 );
39
+				$name = substr($option, 2, $pos - 2);
40 40
 
41
-				if( isset( $options[$name] ) )
41
+				if (isset($options[$name]))
42 42
 				{
43 43
 					$options[$name] = (array) $options[$name];
44
-					$options[$name][] = substr( $option, $pos + 1 );
44
+					$options[$name][] = substr($option, $pos + 1);
45 45
 				}
46 46
 				else
47 47
 				{
48
-					$options[$name] = substr( $option, $pos + 1 );
48
+					$options[$name] = substr($option, $pos + 1);
49 49
 				}
50 50
 
51
-				unset( $params[$key] );
51
+				unset($params[$key]);
52 52
 			}
53 53
 		}
54 54
 
@@ -62,19 +62,19 @@  discard block
 block discarded – undo
62 62
 	 * @param \Aimeos\MShop\Context\Item\Iface $ctx Context object
63 63
 	 * @param string|null $sites List of site codes separated by a space
64 64
 	 */
65
-	protected static function getSiteItems( \Aimeos\MShop\Context\Item\Iface $ctx, $sites )
65
+	protected static function getSiteItems(\Aimeos\MShop\Context\Item\Iface $ctx, $sites)
66 66
 	{
67
-		$manager = \Aimeos\MShop\Factory::createManager( $ctx, 'locale/site' );
67
+		$manager = \Aimeos\MShop\Factory::createManager($ctx, 'locale/site');
68 68
 		$search = $manager->createSearch();
69 69
 
70
-		if( is_scalar( $sites ) && $sites != '' ) {
71
-			$sites = explode( ' ', $sites );
70
+		if (is_scalar($sites) && $sites != '') {
71
+			$sites = explode(' ', $sites);
72 72
 		}
73 73
 
74
-		if( !empty( $sites ) ) {
75
-			$search->setConditions( $search->compare( '==', 'locale.site.code', $sites ) );
74
+		if (!empty($sites)) {
75
+			$search->setConditions($search->compare('==', 'locale.site.code', $sites));
76 76
 		}
77 77
 
78
-		return $manager->searchItems( $search );
78
+		return $manager->searchItems($search);
79 79
 	}
80 80
 }
81 81
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,8 +42,7 @@
 block discarded – undo
42 42
 				{
43 43
 					$options[$name] = (array) $options[$name];
44 44
 					$options[$name][] = substr( $option, $pos + 1 );
45
-				}
46
-				else
45
+				} else
47 46
 				{
48 47
 					$options[$name] = substr( $option, $pos + 1 );
49 48
 				}
Please login to merge, or discard this patch.
jobs.php 2 patches
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -20,14 +20,12 @@  discard block
 block discarded – undo
20 20
 	require 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
21 21
 
22 22
 	\Aimeos\Slim\Command\Jobs::run( $_SERVER['argv'] );
23
-}
24
-catch( \Aimeos\Slim\Command\Exception $e )
23
+} catch( \Aimeos\Slim\Command\Exception $e )
25 24
 {
26 25
 	echo $e->getMessage() . "\n";
27 26
 	echo \Aimeos\Slim\Command\Jobs::usage();
28 27
 	exit( 1 );
29
-}
30
-catch( \Throwable $t )
28
+} catch( \Throwable $t )
31 29
 {
32 30
 	echo "\n\nCaught PHP error while processing setup";
33 31
 	echo "\n\nMessage:\n";
@@ -36,8 +34,7 @@  discard block
 block discarded – undo
36 34
 	echo $t->getTraceAsString();
37 35
 	echo "\n\n";
38 36
 	exit( 1 );
39
-}
40
-catch( \Exception $e )
37
+} catch( \Exception $e )
41 38
 {
42 39
 	echo "\n\nCaught exception while processing setup";
43 40
 	echo "\n\nMessage:\n";
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -6,28 +6,28 @@  discard block
 block discarded – undo
6 6
  */
7 7
 
8 8
 
9
-if( php_sapi_name() != 'cli' ) {
10
-	exit( 'Setup can only be started via command line for security reasons' );
9
+if (php_sapi_name() != 'cli') {
10
+	exit('Setup can only be started via command line for security reasons');
11 11
 }
12 12
 
13
-ini_set( 'display_errors', 1 );
14
-date_default_timezone_set( 'UTC' );
13
+ini_set('display_errors', 1);
14
+date_default_timezone_set('UTC');
15 15
 
16 16
 
17 17
 
18 18
 try
19 19
 {
20
-	require 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
20
+	require 'vendor'.DIRECTORY_SEPARATOR.'autoload.php';
21 21
 
22
-	\Aimeos\Slim\Command\Jobs::run( $_SERVER['argv'] );
22
+	\Aimeos\Slim\Command\Jobs::run($_SERVER['argv']);
23 23
 }
24
-catch( \Aimeos\Slim\Command\Exception $e )
24
+catch (\Aimeos\Slim\Command\Exception $e)
25 25
 {
26
-	echo $e->getMessage() . "\n";
26
+	echo $e->getMessage()."\n";
27 27
 	echo \Aimeos\Slim\Command\Jobs::usage();
28
-	exit( 1 );
28
+	exit(1);
29 29
 }
30
-catch( \Throwable $t )
30
+catch (\Throwable $t)
31 31
 {
32 32
 	echo "\n\nCaught PHP error while processing setup";
33 33
 	echo "\n\nMessage:\n";
@@ -35,9 +35,9 @@  discard block
 block discarded – undo
35 35
 	echo "\n\nStack trace:\n";
36 36
 	echo $t->getTraceAsString();
37 37
 	echo "\n\n";
38
-	exit( 1 );
38
+	exit(1);
39 39
 }
40
-catch( \Exception $e )
40
+catch (\Exception $e)
41 41
 {
42 42
 	echo "\n\nCaught exception while processing setup";
43 43
 	echo "\n\nMessage:\n";
@@ -45,5 +45,5 @@  discard block
 block discarded – undo
45 45
 	echo "\n\nStack trace:\n";
46 46
 	echo $e->getTraceAsString();
47 47
 	echo "\n\n";
48
-	exit( 1 );
48
+	exit(1);
49 49
 }
Please login to merge, or discard this patch.
cache.php 2 patches
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -19,14 +19,12 @@  discard block
 block discarded – undo
19 19
 	require 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
20 20
 
21 21
 	\Aimeos\Slim\Command\Cache::run( $_SERVER['argv'] );
22
-}
23
-catch( \Aimeos\Slim\Command\Exception $e )
22
+} catch( \Aimeos\Slim\Command\Exception $e )
24 23
 {
25 24
 	echo $e->getMessage() . "\n";
26 25
 	echo \Aimeos\Slim\Command\Cache::usage();
27 26
 	exit( 1 );
28
-}
29
-catch( \Throwable $t )
27
+} catch( \Throwable $t )
30 28
 {
31 29
 	echo "\n\nCaught PHP error";
32 30
 	echo "\n\nMessage:\n";
@@ -35,8 +33,7 @@  discard block
 block discarded – undo
35 33
 	echo $t->getTraceAsString();
36 34
 	echo "\n\n";
37 35
 	exit( 1 );
38
-}
39
-catch( \Exception $e )
36
+} catch( \Exception $e )
40 37
 {
41 38
 	echo "\n\nCaught exception";
42 39
 	echo "\n\nMessage:\n";
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -6,27 +6,27 @@  discard block
 block discarded – undo
6 6
  */
7 7
 
8 8
 
9
-if( php_sapi_name() != 'cli' ) {
10
-	exit( 'Setup can only be started via command line for security reasons' );
9
+if (php_sapi_name() != 'cli') {
10
+	exit('Setup can only be started via command line for security reasons');
11 11
 }
12 12
 
13
-ini_set( 'display_errors', 1 );
14
-date_default_timezone_set( 'UTC' );
13
+ini_set('display_errors', 1);
14
+date_default_timezone_set('UTC');
15 15
 
16 16
 
17 17
 try
18 18
 {
19
-	require 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
19
+	require 'vendor'.DIRECTORY_SEPARATOR.'autoload.php';
20 20
 
21
-	\Aimeos\Slim\Command\Cache::run( $_SERVER['argv'] );
21
+	\Aimeos\Slim\Command\Cache::run($_SERVER['argv']);
22 22
 }
23
-catch( \Aimeos\Slim\Command\Exception $e )
23
+catch (\Aimeos\Slim\Command\Exception $e)
24 24
 {
25
-	echo $e->getMessage() . "\n";
25
+	echo $e->getMessage()."\n";
26 26
 	echo \Aimeos\Slim\Command\Cache::usage();
27
-	exit( 1 );
27
+	exit(1);
28 28
 }
29
-catch( \Throwable $t )
29
+catch (\Throwable $t)
30 30
 {
31 31
 	echo "\n\nCaught PHP error";
32 32
 	echo "\n\nMessage:\n";
@@ -34,9 +34,9 @@  discard block
 block discarded – undo
34 34
 	echo "\n\nStack trace:\n";
35 35
 	echo $t->getTraceAsString();
36 36
 	echo "\n\n";
37
-	exit( 1 );
37
+	exit(1);
38 38
 }
39
-catch( \Exception $e )
39
+catch (\Exception $e)
40 40
 {
41 41
 	echo "\n\nCaught exception";
42 42
 	echo "\n\nMessage:\n";
@@ -44,5 +44,5 @@  discard block
 block discarded – undo
44 44
 	echo "\n\nStack trace:\n";
45 45
 	echo $e->getTraceAsString();
46 46
 	echo "\n\n";
47
-	exit( 1 );
47
+	exit(1);
48 48
 }
Please login to merge, or discard this patch.
src/Base/View.php 3 patches
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -143,7 +143,6 @@
 block discarded – undo
143 143
 	 * Adds the "param" helper to the view object
144 144
 	 *
145 145
 	 * @param \Aimeos\MW\View\Iface $view View object
146
-	 * @param array $attributes Associative list of request parameters
147 146
 	 * @return \Aimeos\MW\View\Iface Modified view object
148 147
 	 */
149 148
 	protected static function addParam( \Aimeos\MW\View\Iface $view, array $params )
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -60,8 +60,7 @@  discard block
 block discarded – undo
60 60
 
61 61
 			$view = new \Aimeos\MW\View\Standard( $templatePaths, $engines );
62 62
 			$this->initTwig( $view, $twig );
63
-		}
64
-		else
63
+		} else
65 64
 		{
66 65
 			$view = new \Aimeos\MW\View\Standard( $templatePaths );
67 66
 		}
@@ -212,8 +211,7 @@  discard block
 block discarded – undo
212 211
 		{
213 212
 			$i18n = $this->container->get( 'aimeos_i18n' )->get( array( $locale ) );
214 213
 			$translation = $i18n[$locale];
215
-		}
216
-		else
214
+		} else
217 215
 		{
218 216
 			$translation = new \Aimeos\MW\Translation\None( 'en' );
219 217
 		}
Please login to merge, or discard this patch.
Spacing   +70 added lines, -70 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 	 *
31 31
 	 * @param ContainerInterface $container Dependency container
32 32
 	 */
33
-	public function __construct( ContainerInterface $container )
33
+	public function __construct(ContainerInterface $container)
34 34
 	{
35 35
 		$this->container = $container;
36 36
 	}
@@ -47,38 +47,38 @@  discard block
 block discarded – undo
47 47
 	 * @param string|null $locale Code of the current language or null for no translation
48 48
 	 * @return \Aimeos\MW\View\Iface View object
49 49
 	 */
50
-	public function create( \Aimeos\MShop\Context\Item\Iface $context, ServerRequestInterface $request,
51
-		ResponseInterface $response, array $attributes, array $templatePaths, $locale = null )
50
+	public function create(\Aimeos\MShop\Context\Item\Iface $context, ServerRequestInterface $request,
51
+		ResponseInterface $response, array $attributes, array $templatePaths, $locale = null)
52 52
 	{
53 53
 		$iface = 'Slim\Views\Twig';
54 54
 		$params = $attributes + (array) $request->getParsedBody() + (array) $request->getQueryParams();
55 55
 
56
-		if( isset( $this->container['view'] ) && $this->container['view'] instanceof $iface )
56
+		if (isset($this->container['view']) && $this->container['view'] instanceof $iface)
57 57
 		{
58 58
 			$twig = $this->container['view']->getEnvironment();
59
-			$engines = array( '.html.twig' => new \Aimeos\MW\View\Engine\Twig( $twig ) );
59
+			$engines = array('.html.twig' => new \Aimeos\MW\View\Engine\Twig($twig));
60 60
 
61
-			$view = new \Aimeos\MW\View\Standard( $templatePaths, $engines );
62
-			$this->initTwig( $view, $twig );
61
+			$view = new \Aimeos\MW\View\Standard($templatePaths, $engines);
62
+			$this->initTwig($view, $twig);
63 63
 		}
64 64
 		else
65 65
 		{
66
-			$view = new \Aimeos\MW\View\Standard( $templatePaths );
66
+			$view = new \Aimeos\MW\View\Standard($templatePaths);
67 67
 		}
68 68
 
69 69
 		$config = $context->getConfig();
70 70
 		$session = $context->getSession();
71 71
 
72
-		$this->addAccess( $view );
73
-		$this->addConfig( $view, $config );
74
-		$this->addCsrf( $view, $request );
75
-		$this->addNumber( $view, $config );
76
-		$this->addParam( $view, $params );
77
-		$this->addRequest( $view, $request );
78
-		$this->addResponse( $view, $response );
79
-		$this->addSession( $view, $session );
80
-		$this->addTranslate( $view, $locale );
81
-		$this->addUrl( $view, $attributes );
72
+		$this->addAccess($view);
73
+		$this->addConfig($view, $config);
74
+		$this->addCsrf($view, $request);
75
+		$this->addNumber($view, $config);
76
+		$this->addParam($view, $params);
77
+		$this->addRequest($view, $request);
78
+		$this->addResponse($view, $response);
79
+		$this->addSession($view, $session);
80
+		$this->addTranslate($view, $locale);
81
+		$this->addUrl($view, $attributes);
82 82
 
83 83
 		return $view;
84 84
 	}
@@ -90,10 +90,10 @@  discard block
 block discarded – undo
90 90
 	 * @param \Aimeos\MW\View\Iface $view View object
91 91
 	 * @return \Aimeos\MW\View\Iface Modified view object
92 92
 	 */
93
-	protected function addAccess( \Aimeos\MW\View\Iface $view )
93
+	protected function addAccess(\Aimeos\MW\View\Iface $view)
94 94
 	{
95
-		$helper = new \Aimeos\MW\View\Helper\Access\All( $view );
96
-		$view->addHelper( 'access', $helper );
95
+		$helper = new \Aimeos\MW\View\Helper\Access\All($view);
96
+		$view->addHelper('access', $helper);
97 97
 
98 98
 		return $view;
99 99
 	}
@@ -106,11 +106,11 @@  discard block
 block discarded – undo
106 106
 	 * @param \Aimeos\MW\Config\Iface $config Configuration object
107 107
 	 * @return \Aimeos\MW\View\Iface Modified view object
108 108
 	 */
109
-	protected function addConfig( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config )
109
+	protected function addConfig(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config)
110 110
 	{
111
-		$config = new \Aimeos\MW\Config\Decorator\Protect( clone $config, array( 'admin', 'client' ) );
112
-		$helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config );
113
-		$view->addHelper( 'config', $helper );
111
+		$config = new \Aimeos\MW\Config\Decorator\Protect(clone $config, array('admin', 'client'));
112
+		$helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config);
113
+		$view->addHelper('config', $helper);
114 114
 
115 115
 		return $view;
116 116
 	}
@@ -123,13 +123,13 @@  discard block
 block discarded – undo
123 123
 	 * @param ServerRequestInterface $request Request object
124 124
 	 * @return \Aimeos\MW\View\Iface Modified view object
125 125
 	 */
126
-	protected function addCsrf( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request )
126
+	protected function addCsrf(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request)
127 127
 	{
128
-		$name = $request->getAttribute( 'csrf_name' );
129
-		$value = $request->getAttribute( 'csrf_value' );
128
+		$name = $request->getAttribute('csrf_name');
129
+		$value = $request->getAttribute('csrf_value');
130 130
 
131
-		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, $name, $value );
132
-		$view->addHelper( 'csrf', $helper );
131
+		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, $name, $value);
132
+		$view->addHelper('csrf', $helper);
133 133
 
134 134
 		return $view;
135 135
 	}
@@ -142,14 +142,14 @@  discard block
 block discarded – undo
142 142
 	 * @param \Aimeos\MW\Config\Iface $config Configuration object
143 143
 	 * @return \Aimeos\MW\View\Iface Modified view object
144 144
 	 */
145
-	protected function addNumber( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config )
145
+	protected function addNumber(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config)
146 146
 	{
147
-		$sepDec = $config->get( 'client/html/common/format/separatorDecimal', '.' );
148
-		$sep1000 = $config->get( 'client/html/common/format/separator1000', ' ' );
149
-		$decimals = $config->get( 'client/html/common/format/decimals', 2 );
147
+		$sepDec = $config->get('client/html/common/format/separatorDecimal', '.');
148
+		$sep1000 = $config->get('client/html/common/format/separator1000', ' ');
149
+		$decimals = $config->get('client/html/common/format/decimals', 2);
150 150
 
151
-		$helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000, $decimals );
152
-		$view->addHelper( 'number', $helper );
151
+		$helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000, $decimals);
152
+		$view->addHelper('number', $helper);
153 153
 
154 154
 		return $view;
155 155
 	}
@@ -162,10 +162,10 @@  discard block
 block discarded – undo
162 162
 	 * @param array $attributes Associative list of request parameters
163 163
 	 * @return \Aimeos\MW\View\Iface Modified view object
164 164
 	 */
165
-	protected static function addParam( \Aimeos\MW\View\Iface $view, array $params )
165
+	protected static function addParam(\Aimeos\MW\View\Iface $view, array $params)
166 166
 	{
167
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params );
168
-		$view->addHelper( 'param', $helper );
167
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params);
168
+		$view->addHelper('param', $helper);
169 169
 
170 170
 		return $view;
171 171
 	}
@@ -178,10 +178,10 @@  discard block
 block discarded – undo
178 178
 	 * @param ServerRequestInterface $request Request object
179 179
 	 * @return \Aimeos\MW\View\Iface Modified view object
180 180
 	 */
181
-	protected static function addRequest( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request )
181
+	protected static function addRequest(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request)
182 182
 	{
183
-		$helper = new \Aimeos\MW\View\Helper\Request\Slim( $view, $request );
184
-		$view->addHelper( 'request', $helper );
183
+		$helper = new \Aimeos\MW\View\Helper\Request\Slim($view, $request);
184
+		$view->addHelper('request', $helper);
185 185
 
186 186
 		return $view;
187 187
 	}
@@ -194,10 +194,10 @@  discard block
 block discarded – undo
194 194
 	 * @param ResponseInterface $response Response object
195 195
 	 * @return \Aimeos\MW\View\Iface Modified view object
196 196
 	 */
197
-	protected static function addResponse( \Aimeos\MW\View\Iface $view, ResponseInterface $response )
197
+	protected static function addResponse(\Aimeos\MW\View\Iface $view, ResponseInterface $response)
198 198
 	{
199
-		$helper = new \Aimeos\MW\View\Helper\Response\Slim( $view, $response );
200
-		$view->addHelper( 'response', $helper );
199
+		$helper = new \Aimeos\MW\View\Helper\Response\Slim($view, $response);
200
+		$view->addHelper('response', $helper);
201 201
 
202 202
 		return $view;
203 203
 	}
@@ -210,10 +210,10 @@  discard block
 block discarded – undo
210 210
 	 * @param \Aimeos\MW\Session\Iface $session Session object
211 211
 	 * @return \Aimeos\MW\View\Iface Modified view object
212 212
 	 */
213
-	protected function addSession( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Session\Iface $session )
213
+	protected function addSession(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Session\Iface $session)
214 214
 	{
215
-		$helper = new \Aimeos\MW\View\Helper\Session\Standard( $view, $session );
216
-		$view->addHelper( 'session', $helper );
215
+		$helper = new \Aimeos\MW\View\Helper\Session\Standard($view, $session);
216
+		$view->addHelper('session', $helper);
217 217
 
218 218
 		return $view;
219 219
 	}
@@ -226,20 +226,20 @@  discard block
 block discarded – undo
226 226
 	 * @param string|null $locale ISO language code, e.g. "de" or "de_CH"
227 227
 	 * @return \Aimeos\MW\View\Iface Modified view object
228 228
 	 */
229
-	protected function addTranslate( \Aimeos\MW\View\Iface $view, $locale )
229
+	protected function addTranslate(\Aimeos\MW\View\Iface $view, $locale)
230 230
 	{
231
-		if( $locale !== null )
231
+		if ($locale !== null)
232 232
 		{
233
-			$i18n = $this->container->get( 'aimeos_i18n' )->get( array( $locale ) );
233
+			$i18n = $this->container->get('aimeos_i18n')->get(array($locale));
234 234
 			$translation = $i18n[$locale];
235 235
 		}
236 236
 		else
237 237
 		{
238
-			$translation = new \Aimeos\MW\Translation\None( 'en' );
238
+			$translation = new \Aimeos\MW\Translation\None('en');
239 239
 		}
240 240
 
241
-		$helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation );
242
-		$view->addHelper( 'translate', $helper );
241
+		$helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation);
242
+		$view->addHelper('translate', $helper);
243 243
 
244 244
 		return $view;
245 245
 	}
@@ -252,24 +252,24 @@  discard block
 block discarded – undo
252 252
 	 * @param array $attributes Associative list of URI parameters
253 253
 	 * @return \Aimeos\MW\View\Iface Modified view object
254 254
 	 */
255
-	protected function addUrl( \Aimeos\MW\View\Iface $view, array $attributes )
255
+	protected function addUrl(\Aimeos\MW\View\Iface $view, array $attributes)
256 256
 	{
257 257
 		$fixed = array();
258 258
 
259
-		if( isset( $attributes['site'] ) ) {
259
+		if (isset($attributes['site'])) {
260 260
 			$fixed['site'] = $attributes['site'];
261 261
 		}
262 262
 
263
-		if( isset( $attributes['locale'] ) ) {
263
+		if (isset($attributes['locale'])) {
264 264
 			$fixed['locale'] = $attributes['locale'];
265 265
 		}
266 266
 
267
-		if( isset( $attributes['currency'] ) ) {
267
+		if (isset($attributes['currency'])) {
268 268
 			$fixed['currency'] = $attributes['currency'];
269 269
 		}
270 270
 
271
-		$helper = new \Aimeos\MW\View\Helper\Url\Slim( $view, $this->container->get( 'router' ), $fixed );
272
-		$view->addHelper( 'url', $helper );
271
+		$helper = new \Aimeos\MW\View\Helper\Url\Slim($view, $this->container->get('router'), $fixed);
272
+		$view->addHelper('url', $helper);
273 273
 
274 274
 		return $view;
275 275
 	}
@@ -281,21 +281,21 @@  discard block
 block discarded – undo
281 281
 	 * @param \Aimeos\MW\View\Iface $view View object
282 282
 	 * @param \Twig_Environment $twig Twig environment object
283 283
 	 */
284
-	protected function initTwig( \Aimeos\MW\View\Iface $view, \Twig_Environment $twig )
284
+	protected function initTwig(\Aimeos\MW\View\Iface $view, \Twig_Environment $twig)
285 285
 	{
286
-		$fcn = function( $key, $default = null ) use ( $view ) {
287
-			return $view->config( $key, $default );
286
+		$fcn = function($key, $default = null) use ($view) {
287
+			return $view->config($key, $default);
288 288
 		};
289
-		$twig->addFunction( new \Twig_SimpleFunction( 'aiconfig', $fcn ) );
289
+		$twig->addFunction(new \Twig_SimpleFunction('aiconfig', $fcn));
290 290
 
291
-		$fcn = function( $singular, array $values = array(), $domain = 'client' ) use ( $view ) {
292
-			return vsprintf( $view->translate( $domain, $singular ), $values );
291
+		$fcn = function($singular, array $values = array(), $domain = 'client') use ($view) {
292
+			return vsprintf($view->translate($domain, $singular), $values);
293 293
 		};
294
-		$twig->addFunction( new \Twig_SimpleFunction( 'aitrans', $fcn ) );
294
+		$twig->addFunction(new \Twig_SimpleFunction('aitrans', $fcn));
295 295
 
296
-		$fcn = function( $singular, $plural, $number, array $values = array(), $domain = 'client' ) use ( $view ) {
297
-			return vsprintf( $view->translate( $domain, $singular, $plural, $number ), $values );
296
+		$fcn = function($singular, $plural, $number, array $values = array(), $domain = 'client') use ($view) {
297
+			return vsprintf($view->translate($domain, $singular, $plural, $number), $values);
298 298
 		};
299
-		$twig->addFunction( new \Twig_SimpleFunction( 'aitransplural', $fcn ) );
299
+		$twig->addFunction(new \Twig_SimpleFunction('aitransplural', $fcn));
300 300
 	}
301 301
 }
Please login to merge, or discard this patch.
src/Command/Cache.php 1 patch
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -34,19 +34,19 @@  discard block
 block discarded – undo
34 34
 	 *
35 35
 	 * @param array $argv Associative array from $_SERVER['argv']
36 36
 	 */
37
-	public static function run( array $argv )
37
+	public static function run(array $argv)
38 38
 	{
39
-		array_shift( $argv );
40
-		$options = self::getOptions( $argv );
41
-		$sites = array_shift( $argv );
39
+		array_shift($argv);
40
+		$options = self::getOptions($argv);
41
+		$sites = array_shift($argv);
42 42
 
43
-		$extdirs = ( isset( $options['extdir'] ) ? (array) $options['extdir'] : array() );
44
-		$aimeos = new \Aimeos\Bootstrap( $extdirs );
43
+		$extdirs = (isset($options['extdir']) ? (array) $options['extdir'] : array());
44
+		$aimeos = new \Aimeos\Bootstrap($extdirs);
45 45
 
46
-		$ctx = self::getContext( $aimeos->getConfigPaths(), $options );
47
-		$siteItems = self::getSiteItems( $ctx, $sites );
46
+		$ctx = self::getContext($aimeos->getConfigPaths(), $options);
47
+		$siteItems = self::getSiteItems($ctx, $sites);
48 48
 
49
-		self::clear( $ctx, $siteItems );
49
+		self::clear($ctx, $siteItems);
50 50
 	}
51 51
 
52 52
 
@@ -57,38 +57,38 @@  discard block
 block discarded – undo
57 57
 	 * @param array $options Associative list of configuration options as key/value pairs
58 58
 	 * @return \Aimeos\MShop\Context\Item\Iface Context object
59 59
 	 */
60
-	protected static function getContext( array $confPaths, array $options )
60
+	protected static function getContext(array $confPaths, array $options)
61 61
 	{
62 62
 		$config = array();
63 63
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
64 64
 
65
-		if( isset( $options['config'] ) )
65
+		if (isset($options['config']))
66 66
 		{
67
-			foreach( (array) $options['config'] as $path )
67
+			foreach ((array) $options['config'] as $path)
68 68
 			{
69
-				if( is_file( $path ) ) {
70
-					$config = array_replace_recursive( $config, require $path );
69
+				if (is_file($path)) {
70
+					$config = array_replace_recursive($config, require $path);
71 71
 				} else {
72 72
 					$confPaths[] = $path;
73 73
 				}
74 74
 			}
75 75
 		}
76 76
 
77
-		$conf = new \Aimeos\MW\Config\PHPArray( $config, $confPaths );
78
-		$conf = new \Aimeos\MW\Config\Decorator\Memory( $conf );
77
+		$conf = new \Aimeos\MW\Config\PHPArray($config, $confPaths);
78
+		$conf = new \Aimeos\MW\Config\Decorator\Memory($conf);
79 79
 
80
-		if( ( $cfg = $conf->get( 'command' ) ) !== null ) {
81
-			$conf = new \Aimeos\MW\Config\Decorator\Memory( $conf, $cfg );
80
+		if (($cfg = $conf->get('command')) !== null) {
81
+			$conf = new \Aimeos\MW\Config\Decorator\Memory($conf, $cfg);
82 82
 		}
83 83
 
84
-		$ctx->setConfig( $conf );
84
+		$ctx->setConfig($conf);
85 85
 
86 86
 
87
-		$dbm = new \Aimeos\MW\DB\Manager\PDO( $conf );
88
-		$ctx->setDatabaseManager( $dbm );
87
+		$dbm = new \Aimeos\MW\DB\Manager\PDO($conf);
88
+		$ctx->setDatabaseManager($dbm);
89 89
 
90
-		$logger = new \Aimeos\MW\Logger\Errorlog( \Aimeos\MW\Logger\Base::INFO );
91
-		$ctx->setLogger( $logger );
90
+		$logger = new \Aimeos\MW\Logger\Errorlog(\Aimeos\MW\Logger\Base::INFO);
91
+		$ctx->setLogger($logger);
92 92
 
93 93
 		return $ctx;
94 94
 	}
@@ -100,23 +100,23 @@  discard block
 block discarded – undo
100 100
 	 * @param \Aimeos\MShop\Context\Item\Iface $ctx Context object
101 101
 	 * @param array $siteItems List of site items implementing \Aimeos\MShop\Locale\Site\Iface
102 102
 	 */
103
-	protected static function clear( \Aimeos\MShop\Context\Item\Iface $ctx, array $siteItems )
103
+	protected static function clear(\Aimeos\MShop\Context\Item\Iface $ctx, array $siteItems)
104 104
 	{
105
-		$localeManager = \Aimeos\MShop\Factory::createManager( $ctx, 'locale' );
105
+		$localeManager = \Aimeos\MShop\Factory::createManager($ctx, 'locale');
106 106
 
107
-		foreach( $siteItems as $siteItem )
107
+		foreach ($siteItems as $siteItem)
108 108
 		{
109
-			$localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );
109
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
110 110
 
111 111
 			$lcontext = clone $ctx;
112
-			$lcontext->setLocale( $localeItem );
112
+			$lcontext->setLocale($localeItem);
113 113
 
114
-			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext );
115
-			$lcontext->setCache( $cache );
114
+			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext);
115
+			$lcontext->setCache($cache);
116 116
 
117
-			printf( "Clearing the Aimeos cache for site \"%1\$s\"\n", $siteItem->getCode() );
117
+			printf("Clearing the Aimeos cache for site \"%1\$s\"\n", $siteItem->getCode());
118 118
 
119
-			\Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->clear();
119
+			\Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->clear();
120 120
 		}
121 121
 	}
122 122
 }
123 123
\ No newline at end of file
Please login to merge, or discard this patch.
src/Base/Config.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 	 *
30 30
 	 * @param ContainerInterface $container Dependency container
31 31
 	 */
32
-	public function __construct( ContainerInterface $container, $settings )
32
+	public function __construct(ContainerInterface $container, $settings)
33 33
 	{
34 34
 		$this->container = $container;
35 35
 		$this->settings = $settings;
@@ -42,19 +42,19 @@  discard block
 block discarded – undo
42 42
 	 * @param string $type Configuration type ("frontend" or "backend")
43 43
 	 * @return \Aimeos\MW\Config\Iface Config object
44 44
 	 */
45
-	public function get( $type = 'frontend' )
45
+	public function get($type = 'frontend')
46 46
 	{
47
-		$paths = $this->container->get( 'aimeos' )->getConfigPaths();
48
-		$config = new \Aimeos\MW\Config\PHPArray( array(), $paths );
47
+		$paths = $this->container->get('aimeos')->getConfigPaths();
48
+		$config = new \Aimeos\MW\Config\PHPArray(array(), $paths);
49 49
 
50
-		if( function_exists( 'apcu_store' ) === true && $config->get( 'apc_enabled', false ) == true ) {
51
-			$config = new \Aimeos\MW\Config\Decorator\APC( $config, $config->get( 'apc_prefix', 'slim:' ) );
50
+		if (function_exists('apcu_store') === true && $config->get('apc_enabled', false) == true) {
51
+			$config = new \Aimeos\MW\Config\Decorator\APC($config, $config->get('apc_prefix', 'slim:'));
52 52
 		}
53 53
 
54
-		$config = new \Aimeos\MW\Config\Decorator\Memory( $config, $this->settings );
54
+		$config = new \Aimeos\MW\Config\Decorator\Memory($config, $this->settings);
55 55
 
56
-		if( isset( $this->settings[$type] ) ) {
57
-			$config = new \Aimeos\MW\Config\Decorator\Memory( $config, $this->settings[$type] );
56
+		if (isset($this->settings[$type])) {
57
+			$config = new \Aimeos\MW\Config\Decorator\Memory($config, $this->settings[$type]);
58 58
 		}
59 59
 
60 60
 		return $config;
Please login to merge, or discard this patch.
src/Base/I18n.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 	 *
30 30
 	 * @param ContainerInterface $container Dependency container
31 31
 	 */
32
-	public function __construct( ContainerInterface $container )
32
+	public function __construct(ContainerInterface $container)
33 33
 	{
34 34
 		$this->container = $container;
35 35
 	}
@@ -41,23 +41,23 @@  discard block
 block discarded – undo
41 41
 	 * @param array $languageIds List of two letter ISO language IDs
42 42
 	 * @return \Aimeos\MW\Translation\Iface[] List of translation objects
43 43
 	 */
44
-	public function get( array $languageIds )
44
+	public function get(array $languageIds)
45 45
 	{
46
-		$config = $this->container->get( 'aimeos_config' )->get();
47
-		$i18nPaths = $this->container->get( 'aimeos' )->getI18nPaths();
46
+		$config = $this->container->get('aimeos_config')->get();
47
+		$i18nPaths = $this->container->get('aimeos')->getI18nPaths();
48 48
 
49
-		foreach( $languageIds as $langid )
49
+		foreach ($languageIds as $langid)
50 50
 		{
51
-			if( !isset( $this->i18n[$langid] ) )
51
+			if (!isset($this->i18n[$langid]))
52 52
 			{
53
-				$i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $langid );
53
+				$i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $langid);
54 54
 
55
-				if( function_exists( 'apcu_store' ) === true && $config->get( 'apc_enabled', false ) == true ) {
56
-					$i18n = new \Aimeos\MW\Translation\Decorator\APC( $i18n, $config->get( 'apc_prefix', 'slim:' ) );
55
+				if (function_exists('apcu_store') === true && $config->get('apc_enabled', false) == true) {
56
+					$i18n = new \Aimeos\MW\Translation\Decorator\APC($i18n, $config->get('apc_prefix', 'slim:'));
57 57
 				}
58 58
 
59
-				if( ( $cfg = $config->get( 'i18n/' . $langid, array() ) ) !== array() ) {
60
-					$i18n = new \Aimeos\MW\Translation\Decorator\Memory( $i18n, $cfg );
59
+				if (($cfg = $config->get('i18n/'.$langid, array())) !== array()) {
60
+					$i18n = new \Aimeos\MW\Translation\Decorator\Memory($i18n, $cfg);
61 61
 				}
62 62
 
63 63
 				$this->i18n[$langid] = $i18n;
Please login to merge, or discard this patch.
src/Controller/Basket.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -31,11 +31,11 @@
 block discarded – undo
31 31
 	 * @param array $args Associative list of route parameters
32 32
 	 * @return ResponseInterface $response Modified response object with generated output
33 33
 	 */
34
-	public static function indexAction( ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args )
34
+	public static function indexAction(ContainerInterface $container, ServerRequestInterface $request, ResponseInterface $response, array $args)
35 35
 	{
36
-		$contents = $container->get( 'aimeos_page' )->getSections( 'basket-index', $request, $response, $args );
37
-		$response = $container->get( 'view' )->render( $response, 'Basket/index.html.twig', $contents );
36
+		$contents = $container->get('aimeos_page')->getSections('basket-index', $request, $response, $args);
37
+		$response = $container->get('view')->render($response, 'Basket/index.html.twig', $contents);
38 38
 
39
-		return $response->withHeader( 'Cache-Control', 'no-store' );
39
+		return $response->withHeader('Cache-Control', 'no-store');
40 40
 	}
41 41
 }
42 42
\ No newline at end of file
Please login to merge, or discard this patch.