Completed
Push — master ( 175cde...0b6a5d )
by Aimeos
02:43
created
src/Aimeos/Shop/Command/SetupCommand.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -42,18 +42,18 @@  discard block
 block discarded – undo
42 42
 	 * @param string $classname Name of the setup task class
43 43
 	 * @return boolean True if class is found, false if not
44 44
 	 */
45
-	public static function autoload( $classname )
45
+	public static function autoload($classname)
46 46
 	{
47
-		if( strncmp( $classname, 'Aimeos\\MW\\Setup\\Task\\', 21 ) === 0 )
47
+		if (strncmp($classname, 'Aimeos\\MW\\Setup\\Task\\', 21) === 0)
48 48
 		{
49
-			$fileName = substr( $classname, 21 ) . '.php';
50
-			$paths = explode( PATH_SEPARATOR, get_include_path() );
49
+			$fileName = substr($classname, 21).'.php';
50
+			$paths = explode(PATH_SEPARATOR, get_include_path());
51 51
 
52
-			foreach( $paths as $path )
52
+			foreach ($paths as $path)
53 53
 			{
54
-				$file = $path . DIRECTORY_SEPARATOR . $fileName;
54
+				$file = $path.DIRECTORY_SEPARATOR.$fileName;
55 55
 
56
-				if( file_exists( $file ) === true && ( include_once $file ) !== false ) {
56
+				if (file_exists($file) === true && (include_once $file) !== false) {
57 57
 					return true;
58 58
 				}
59 59
 			}
@@ -70,33 +70,33 @@  discard block
 block discarded – undo
70 70
 	 */
71 71
 	public function fire()
72 72
 	{
73
-		$ctx = $this->getLaravel()->make( '\Aimeos\Shop\Base\Context' )->get( false );
74
-		$ctx->setEditor( 'aimeos:setup' );
73
+		$ctx = $this->getLaravel()->make('\Aimeos\Shop\Base\Context')->get(false);
74
+		$ctx->setEditor('aimeos:setup');
75 75
 
76 76
 		$config = $ctx->getConfig();
77
-		$site = $this->argument( 'site' );
78
-		$template = $this->argument( 'tplsite' );
77
+		$site = $this->argument('site');
78
+		$template = $this->argument('tplsite');
79 79
 
80
-		$config->set( 'setup/site', $site );
81
-		$dbconfig = $this->getDbConfig( $config );
82
-		$this->setOptions( $config );
80
+		$config->set('setup/site', $site);
81
+		$dbconfig = $this->getDbConfig($config);
82
+		$this->setOptions($config);
83 83
 
84
-		$taskPaths = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get()->getSetupPaths( $template );
84
+		$taskPaths = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get()->getSetupPaths($template);
85 85
 
86 86
 		$includePaths = $taskPaths;
87 87
 		$includePaths[] = get_include_path();
88 88
 
89
-		if( set_include_path( implode( PATH_SEPARATOR, $includePaths ) ) === false ) {
90
-			throw new Exception( 'Unable to extend include path' );
89
+		if (set_include_path(implode(PATH_SEPARATOR, $includePaths)) === false) {
90
+			throw new Exception('Unable to extend include path');
91 91
 		}
92 92
 
93
-		spl_autoload_register( '\Aimeos\Shop\Command\SetupCommand::autoload', true );
93
+		spl_autoload_register('\Aimeos\Shop\Command\SetupCommand::autoload', true);
94 94
 
95
-		$manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx );
95
+		$manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx);
96 96
 
97
-		$this->info( sprintf( 'Initializing or updating the Aimeos database tables for site "%1$s"', $site ) );
97
+		$this->info(sprintf('Initializing or updating the Aimeos database tables for site "%1$s"', $site));
98 98
 
99
-		$manager->run( 'mysql' );
99
+		$manager->run('mysql');
100 100
 	}
101 101
 
102 102
 
@@ -108,8 +108,8 @@  discard block
 block discarded – undo
108 108
 	protected function getArguments()
109 109
 	{
110 110
 		return array(
111
-			array( 'site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default' ),
112
-			array( 'tplsite', InputArgument::OPTIONAL, 'Site used as template for creating the new one', 'default' ),
111
+			array('site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default'),
112
+			array('tplsite', InputArgument::OPTIONAL, 'Site used as template for creating the new one', 'default'),
113 113
 		);
114 114
 	}
115 115
 
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 	protected function getOptions()
123 123
 	{
124 124
 		return array(
125
-			array( 'option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array() ),
125
+			array('option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array()),
126 126
 		);
127 127
 	}
128 128
 
@@ -133,14 +133,14 @@  discard block
 block discarded – undo
133 133
 	 * @param \Aimeos\MW\Config\Iface $conf Config object
134 134
 	 * @return array Multi-dimensional associative list of database configuration parameters
135 135
 	 */
136
-	protected function getDbConfig( \Aimeos\MW\Config\Iface $conf )
136
+	protected function getDbConfig(\Aimeos\MW\Config\Iface $conf)
137 137
 	{
138
-		$dbconfig = $conf->get( 'resource', array() );
138
+		$dbconfig = $conf->get('resource', array());
139 139
 
140
-		foreach( $dbconfig as $rname => $dbconf )
140
+		foreach ($dbconfig as $rname => $dbconf)
141 141
 		{
142
-			if( strncmp( $rname, 'db', 2 ) !== 0 ) {
143
-				unset( $dbconfig[$rname] );
142
+			if (strncmp($rname, 'db', 2) !== 0) {
143
+				unset($dbconfig[$rname]);
144 144
 			}
145 145
 		}
146 146
 
@@ -155,12 +155,12 @@  discard block
 block discarded – undo
155 155
 	 * @param array Associative list of database configurations
156 156
 	 * @throws \RuntimeException If the format of the options is invalid
157 157
 	 */
158
-	protected function setOptions( \Aimeos\MW\Config\Iface $conf )
158
+	protected function setOptions(\Aimeos\MW\Config\Iface $conf)
159 159
 	{
160
-		foreach( (array) $this->option( 'option' ) as $option )
160
+		foreach ((array) $this->option('option') as $option)
161 161
 		{
162
-			list( $name, $value ) = explode( ':', $option );
163
-			$conf->set( $name, $value );
162
+			list($name, $value) = explode(':', $option);
163
+			$conf->set($name, $value);
164 164
 		}
165 165
 	}
166 166
 }
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/I18n.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	 * @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object
41 41
 	 * @param \Illuminate\Contracts\Config\Repository $config Configuration object
42 42
 	 */
43
-	public function __construct( \Aimeos\Shop\Base\Aimeos $aimeos, \Illuminate\Contracts\Config\Repository $config )
43
+	public function __construct(\Aimeos\Shop\Base\Aimeos $aimeos, \Illuminate\Contracts\Config\Repository $config)
44 44
 	{
45 45
 		$this->aimeos = $aimeos;
46 46
 		$this->config = $config;
@@ -53,22 +53,22 @@  discard block
 block discarded – undo
53 53
 	 * @param array $languageIds List of two letter ISO language IDs
54 54
 	 * @return \Aimeos\MW\Translation\Iface[] List of translation objects
55 55
 	 */
56
-	public function get( array $languageIds )
56
+	public function get(array $languageIds)
57 57
 	{
58 58
 		$i18nPaths = $this->aimeos->get()->getI18nPaths();
59 59
 
60
-		foreach( $languageIds as $langid )
60
+		foreach ($languageIds as $langid)
61 61
 		{
62
-			if( !isset( $this->i18n[$langid] ) )
62
+			if (!isset($this->i18n[$langid]))
63 63
 			{
64
-				$i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $langid );
64
+				$i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $langid);
65 65
 
66
-				if( function_exists( 'apc_store' ) === true && $this->config->get( 'shop.apc_enabled', false ) == true ) {
67
-					$i18n = new \Aimeos\MW\Translation\Decorator\APC( $i18n, $this->config->get( 'shop.apc_prefix', 'laravel:' ) );
66
+				if (function_exists('apc_store') === true && $this->config->get('shop.apc_enabled', false) == true) {
67
+					$i18n = new \Aimeos\MW\Translation\Decorator\APC($i18n, $this->config->get('shop.apc_prefix', 'laravel:'));
68 68
 				}
69 69
 
70
-				if( $this->config->has( 'shop.i18n.' . $langid ) ) {
71
-					$i18n = new \Aimeos\MW\Translation\Decorator\Memory( $i18n, $this->config->get( 'shop.i18n.' . $langid ) );
70
+				if ($this->config->has('shop.i18n.'.$langid)) {
71
+					$i18n = new \Aimeos\MW\Translation\Decorator\Memory($i18n, $this->config->get('shop.i18n.'.$langid));
72 72
 				}
73 73
 
74 74
 				$this->i18n[$langid] = $i18n;
Please login to merge, or discard this patch.
src/default.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -4,20 +4,20 @@  discard block
 block discarded – undo
4 4
 
5 5
 	'apc_enabled' => false,
6 6
 	'apc_prefix' => 'laravel:',
7
-	'extdir' => ( is_dir(base_path('ext')) ? base_path('ext') : dirname(__DIR__) . DIRECTORY_SEPARATOR . 'ext' ),
7
+	'extdir' => (is_dir(base_path('ext')) ? base_path('ext') : dirname(__DIR__).DIRECTORY_SEPARATOR.'ext'),
8 8
 	'uploaddir' => '/',
9 9
 
10 10
 	'page' => array(
11
-		'account-index' => array( '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/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',
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
 				'default' => array(
238 238
 					'mimeicon' => array(
239 239
 						# Directory where icons for the mime types stored
240
-						'directory' => public_path( '/packages/aimeos/shop/mimeicons' ),
240
+						'directory' => public_path('/packages/aimeos/shop/mimeicons'),
241 241
 						# File extension of mime type icons
242 242
 						'extension' => '.png'
243 243
 					),
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
 						# in the "maxwidth" parameter
286 286
 						# 'maxheight' => 280,
287 287
 					),
288
-					'tempdir' => storage_path( 'aimeos' ),
288
+					'tempdir' => storage_path('aimeos'),
289 289
 				),
290 290
 			),
291 291
 			'product' => array(
Please login to merge, or discard this patch.