Completed
Push — master ( 10e0c8...78bf9f )
by Aimeos
02:32
created
src/Aimeos/Shop/Base/Page.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -53,9 +53,9 @@  discard block
 block discarded – undo
53 53
 	 * @param \Aimeos\Shop\Base\Locale $locale Locale object
54 54
 	 * @param \Aimeos\Shop\Base\View $view View object
55 55
 	 */
56
-	public function __construct( \Illuminate\Contracts\Config\Repository $config,
56
+	public function __construct(\Illuminate\Contracts\Config\Repository $config,
57 57
 		\Aimeos\Shop\Base\Aimeos $aimeos, \Aimeos\Shop\Base\Context $context,
58
-		\Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view )
58
+		\Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view)
59 59
 	{
60 60
 		$this->config = $config;
61 61
 		$this->aimeos = $aimeos;
@@ -71,21 +71,21 @@  discard block
 block discarded – undo
71 71
 	 * @param string $pageName Name of the configured page
72 72
 	 * @return array Associative list with body and header output separated by client name
73 73
 	 */
74
-	public function getSections( $pageName )
74
+	public function getSections($pageName)
75 75
 	{
76 76
 		$context = $this->context->get();
77 77
 		$langid = $context->getLocale()->getLanguageId();
78
-		$tmplPaths = $this->aimeos->get()->getCustomPaths( 'client/html/templates' );
79
-		$view = $this->view->create( $context, $tmplPaths, $langid );
80
-		$context->setView( $view );
78
+		$tmplPaths = $this->aimeos->get()->getCustomPaths('client/html/templates');
79
+		$view = $this->view->create($context, $tmplPaths, $langid);
80
+		$context->setView($view);
81 81
 
82
-		$result = array( 'aibody' => array(), 'aiheader' => array() );
83
-		$page = $context->getConfig()->get( 'page/' . $pageName, array() );
82
+		$result = array('aibody' => array(), 'aiheader' => array());
83
+		$page = $context->getConfig()->get('page/'.$pageName, array());
84 84
 
85
-		foreach( (array) $page as $clientName )
85
+		foreach ((array) $page as $clientName)
86 86
 		{
87
-			$client = \Aimeos\Client\Html\Factory::createClient( $context, $tmplPaths, $clientName );
88
-			$client->setView( clone $view );
87
+			$client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName);
88
+			$client->setView(clone $view);
89 89
 			$client->process();
90 90
 
91 91
 			$result['aibody'][$clientName] = $client->getBody();
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/Config.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	 * @param \Illuminate\Contracts\Config\Repository $config Configuration object
41 41
 	 * @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object
42 42
 	 */
43
-	public function __construct( \Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos )
43
+	public function __construct(\Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos)
44 44
 	{
45 45
 		$this->aimeos = $aimeos;
46 46
 		$this->config = $config;
@@ -53,23 +53,23 @@  discard block
 block discarded – undo
53 53
 	 * @param integer $type Configuration type ("frontend" or "backend")
54 54
 	 * @return \Aimeos\MW\Config\Iface Configuration object
55 55
 	 */
56
-	public function get( $type = 'frontend' )
56
+	public function get($type = 'frontend')
57 57
 	{
58
-		if( !isset( $this->objects[$type] ) )
58
+		if (!isset($this->objects[$type]))
59 59
 		{
60 60
 			$configPaths = $this->aimeos->get()->getConfigPaths();
61
-			$cfgfile = dirname( dirname( dirname( __DIR__ ) ) ) . DIRECTORY_SEPARATOR . 'default.php';
61
+			$cfgfile = dirname(dirname(dirname(__DIR__))).DIRECTORY_SEPARATOR.'default.php';
62 62
 
63
-			$config = new \Aimeos\MW\Config\PHPArray( require $cfgfile, $configPaths );
63
+			$config = new \Aimeos\MW\Config\PHPArray(require $cfgfile, $configPaths);
64 64
 
65
-			if( function_exists( 'apc_store' ) === true && $this->config->get( 'shop.apc_enabled', false ) == true ) {
66
-				$config = new \Aimeos\MW\Config\Decorator\APC( $config, $this->config->get( 'shop.apc_prefix', 'laravel:' ) );
65
+			if (function_exists('apc_store') === true && $this->config->get('shop.apc_enabled', false) == true) {
66
+				$config = new \Aimeos\MW\Config\Decorator\APC($config, $this->config->get('shop.apc_prefix', 'laravel:'));
67 67
 			}
68 68
 
69
-			$config = new \Aimeos\MW\Config\Decorator\Memory( $config, $this->config->get( 'shop' ) );
69
+			$config = new \Aimeos\MW\Config\Decorator\Memory($config, $this->config->get('shop'));
70 70
 
71
-			if( ( $conf = $this->config->get( 'shop.' . $type, array() ) ) !== array() ) {
72
-				$config = new \Aimeos\MW\Config\Decorator\Memory( $config, $conf );
71
+			if (($conf = $this->config->get('shop.'.$type, array())) !== array()) {
72
+				$config = new \Aimeos\MW\Config\Decorator\Memory($config, $conf);
73 73
 			}
74 74
 
75 75
 			$this->objects[$type] = $config;
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/Aimeos.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 	 *
35 35
 	 * @param \Illuminate\Contracts\Config\Repository $config Configuration object
36 36
 	 */
37
-	public function __construct( \Illuminate\Contracts\Config\Repository $config )
37
+	public function __construct(\Illuminate\Contracts\Config\Repository $config)
38 38
 	{
39 39
 		$this->config = $config;
40 40
 	}
@@ -47,16 +47,16 @@  discard block
 block discarded – undo
47 47
 	 */
48 48
 	public function get()
49 49
 	{
50
-		if( $this->object === null )
50
+		if ($this->object === null)
51 51
 		{
52
-			$dir = base_path( 'ext' );
52
+			$dir = base_path('ext');
53 53
 
54
-			if( !is_dir( $dir ) ) {
55
-				$dir = dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . DIRECTORY_SEPARATOR . 'ext';
54
+			if (!is_dir($dir)) {
55
+				$dir = dirname(dirname(dirname(dirname(__DIR__)))).DIRECTORY_SEPARATOR.'ext';
56 56
 			}
57 57
 
58
-			$extDirs = (array) $this->config->get( 'shop.extdir', $dir );
59
-			$this->object = new \Aimeos\Bootstrap( $extDirs, false );
58
+			$extDirs = (array) $this->config->get('shop.extdir', $dir);
59
+			$this->object = new \Aimeos\Bootstrap($extDirs, false);
60 60
 		}
61 61
 
62 62
 		return $this->object;
@@ -70,12 +70,12 @@  discard block
 block discarded – undo
70 70
 	 */
71 71
 	public function getVersion()
72 72
 	{
73
-		if( ( $content = @file_get_contents( base_path( 'composer.lock' ) ) ) !== false
74
-			&& ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] )
73
+		if (($content = @file_get_contents(base_path('composer.lock'))) !== false
74
+			&& ($content = json_decode($content, true)) !== null && isset($content['packages'])
75 75
 		) {
76
-			foreach( (array) $content['packages'] as $item )
76
+			foreach ((array) $content['packages'] as $item)
77 77
 			{
78
-				if( $item['name'] === 'aimeos/aimeos-laravel' ) {
78
+				if ($item['name'] === 'aimeos/aimeos-laravel') {
79 79
 					return $item['version'];
80 80
 				}
81 81
 			}
Please login to merge, or discard this patch.
src/default.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -8,16 +8,16 @@  discard block
 block discarded – undo
8 8
 	'uploaddir' => '/',
9 9
 
10 10
 	'page' => array(
11
-		'account-index' => array( 'account/profile','account/history','account/favorite','account/watch','basket/mini','catalog/session' ),
12
-		'basket-index' => array( 'basket/standard','basket/related' ),
13
-		'catalog-count' => array( 'catalog/count' ),
14
-		'catalog-detail' => array( 'basket/mini','catalog/stage','catalog/detail','catalog/session' ),
15
-		'catalog-list' => array( 'basket/mini','catalog/filter','catalog/stage','catalog/lists' ),
16
-		'catalog-stock' => array( 'catalog/stock' ),
17
-		'catalog-suggest' => array( 'catalog/suggest' ),
18
-		'checkout-confirm' => array( 'checkout/confirm' ),
19
-		'checkout-index' => array( 'checkout/standard' ),
20
-		'checkout-update' => array( 'checkout/update'),
11
+		'account-index' => array('account/profile', 'account/history', 'account/favorite', 'account/watch', 'basket/mini', 'catalog/session'),
12
+		'basket-index' => array('basket/standard', 'basket/related'),
13
+		'catalog-count' => array('catalog/count'),
14
+		'catalog-detail' => array('basket/mini', 'catalog/stage', 'catalog/detail', 'catalog/session'),
15
+		'catalog-list' => array('basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists'),
16
+		'catalog-stock' => array('catalog/stock'),
17
+		'catalog-suggest' => array('catalog/suggest'),
18
+		'checkout-confirm' => array('checkout/confirm'),
19
+		'checkout-index' => array('checkout/standard'),
20
+		'checkout-update' => array('checkout/update'),
21 21
 	),
22 22
 
23 23
 	'resource' => array(
@@ -28,24 +28,24 @@  discard block
 block discarded – undo
28 28
 			'database' => env('DB_DATABASE', 'laravel'),
29 29
 			'username' => env('DB_USERNAME', 'root'),
30 30
 			'password' => env('DB_PASSWORD', ''),
31
-			'stmt' => array( "SET NAMES 'utf8'", "SET SESSION sql_mode='ANSI'" ),
31
+			'stmt' => array("SET NAMES 'utf8'", "SET SESSION sql_mode='ANSI'"),
32 32
 			'opt-persistent' => 0,
33 33
 			'limit' => 2,
34 34
 		),
35 35
 		'fs' => array(
36 36
 			'adapter' => 'Standard',
37 37
 			'basedir' => public_path(),
38
-			'tempdir' => storage_path( 'tmp' ),
38
+			'tempdir' => storage_path('tmp'),
39 39
 		),
40 40
 		'fs-admin' => array(
41 41
 			'adapter' => 'Standard',
42
-			'basedir' => public_path( 'uploads' ),
43
-			'tempdir' => storage_path( 'tmp' ),
42
+			'basedir' => public_path('uploads'),
43
+			'tempdir' => storage_path('tmp'),
44 44
 		),
45 45
 		'fs-secure' => array(
46 46
 			'adapter' => 'Standard',
47
-			'basedir' => storage_path( 'secure' ),
48
-			'tempdir' => storage_path( 'tmp' ),
47
+			'basedir' => storage_path('secure'),
48
+			'tempdir' => storage_path('tmp'),
49 49
 		),
50 50
 		'mq' => array(
51 51
 			'adapter' => 'Standard',
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
 						# in the "maxwidth" parameter
268 268
 						# 'maxheight' => 280,
269 269
 					),
270
-					'tempdir' => storage_path( 'aimeos' ),
270
+					'tempdir' => storage_path('aimeos'),
271 271
 				),
272 272
 			),
273 273
 		),
Please login to merge, or discard this patch.