aimeos / aimeos-laravel

src/Aimeos/Shop/ShopServiceProvider.php

Spacing +8 added lines, -8 removed lines

@@ -28,31 +28,31 @@
 	 */
 	public function boot()
 	{
-		$basedir = dirname(dirname(__DIR__)).DIRECTORY_SEPARATOR;
+		$basedir = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR;
 
-		$this->mergeConfigFrom(dirname(dirname(__DIR__)).DIRECTORY_SEPARATOR.'config/shop.php', 'shop');
+		$this->mergeConfigFrom(dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'config/shop.php', 'shop');
 
-		$this->loadViewsFrom($basedir.'views', 'shop');
+		$this->loadViewsFrom($basedir . 'views', 'shop');
 
 
 		$this->publishes(array(
-			$basedir.'config/shop.php' => config_path('shop.php'),
+			$basedir . 'config/shop.php' => config_path('shop.php'),
 		), 'config');
 
 		$this->publishes(array(
-			$basedir.'database/migrations' => base_path('database/migrations'),
+			$basedir . 'database/migrations' => base_path('database/migrations'),
 		), 'migrations');
 
 		$this->publishes(array(
-			$basedir.'views' => base_path('resources/views/vendor/shop'),
+			$basedir . 'views' => base_path('resources/views/vendor/shop'),
 		), 'views');
 
 		$this->publishes(array(
-			dirname($basedir).DIRECTORY_SEPARATOR.'public' => public_path('packages/aimeos/shop'),
+			dirname($basedir) . DIRECTORY_SEPARATOR . 'public' => public_path('packages/aimeos/shop'),
 		), 'public');
 
 
-		require $basedir.'routes.php';
+		require $basedir . 'routes.php';
 	}
 
 

src/Aimeos/Shop/Command/AccountCommand.php

Braces +1 added lines, -2 removed lines

@@ -177,8 +177,7 @@
 		try
 		{
 			$item = $manager->getItem( $code );
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$item = $manager->createItem();
 			$item->setLabel( $code );

Spacing +54 added lines, -54 removed lines

@@ -39,21 +39,21 @@ 
 	 */
 	public function fire()
 	{
-		$code = $this->argument( 'email' );
-		if( ( $password = $this->option( 'password' ) ) === null ) {
-			$password = $this->secret( 'Password' );
+		$code = $this->argument('email');
+		if (($password = $this->option('password')) === null) {
+			$password = $this->secret('Password');
 		}
 
-		$context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false );
-		$context->setEditor( 'aimeos:account' );
+		$context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false);
+		$context->setEditor('aimeos:account');
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
-		$context->setLocale( $localeManager->createItem() );
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
+		$context->setLocale($localeManager->createItem());
 
-		$user = $this->createCustomerItem( $context, $code, $password );
+		$user = $this->createCustomerItem($context, $code, $password);
 
-		if( $this->option( 'admin' ) ) {
-			$this->addPrivilege( $context, $user, 'admin' );
+		if ($this->option('admin')) {
+			$this->addPrivilege($context, $user, 'admin');
 		}
 	}
 
@@ -65,31 +65,31 @@ 
 	 * @param string $userid Unique user ID
 	 * @param string $groupid Unique group ID
 	 */
-	protected function addListItem( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid )
+	protected function addListItem(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid)
 	{
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'lists' );
-		$typeid = $manager->getSubmanager( 'type' )->findItem( 'default', array(), 'customer/group' )->getId();
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('lists');
+		$typeid = $manager->getSubmanager('type')->findItem('default', array(), 'customer/group')->getId();
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'customer.lists.parentid', $userid ),
-			$search->compare( '==', 'customer.lists.refid', $groupid ),
-			$search->compare( '==', 'customer.lists.domain', 'customer/group' ),
-			$search->compare( '==', 'customer.lists.typeid', $typeid ),
+			$search->compare('==', 'customer.lists.parentid', $userid),
+			$search->compare('==', 'customer.lists.refid', $groupid),
+			$search->compare('==', 'customer.lists.domain', 'customer/group'),
+			$search->compare('==', 'customer.lists.typeid', $typeid),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 1);
 
-		if( count( $manager->searchItems( $search ) ) === 0 )
+		if (count($manager->searchItems($search)) === 0)
 		{
 			$item = $manager->createItem();
-			$item->setDomain( 'customer/group' );
-			$item->setParentId( $userid );
-			$item->setTypeId( $typeid );
-			$item->setRefId( $groupid );
-			$item->setStatus( 1 );
+			$item->setDomain('customer/group');
+			$item->setParentId($userid);
+			$item->setTypeId($typeid);
+			$item->setRefId($groupid);
+			$item->setStatus(1);
 
-			$manager->saveItem( $item, false );
+			$manager->saveItem($item, false);
 		}
 	}
 
@@ -101,23 +101,23 @@ 
 	 * @param \Aimeos\MShop\Customer\Item\Iface $user Aimeos customer object
 	 * @param string $privilege Unique customer group code
 	 */
-	protected function addPrivilege( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $privilege )
+	protected function addPrivilege(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $privilege)
 	{
-		$this->info( sprintf( 'Add "%1$s" privilege to user "%2$s" for sites', $privilege, $user->getCode() ) );
+		$this->info(sprintf('Add "%1$s" privilege to user "%2$s" for sites', $privilege, $user->getCode()));
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
 
-		foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem )
+		foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem)
 		{
-			$localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
 
 			$lcontext = clone $context;
-			$lcontext->setLocale( $localeItem );
+			$lcontext->setLocale($localeItem);
 
-			$this->info( '- ' . $siteItem->getCode() );
+			$this->info('- ' . $siteItem->getCode());
 
-			$groupItem = $this->getGroupItem( $lcontext, $privilege );
-			$this->addListItem( $lcontext, $user->getId(), $groupItem->getId() );
+			$groupItem = $this->getGroupItem($lcontext, $privilege);
+			$this->addListItem($lcontext, $user->getId(), $groupItem->getId());
 		}
 	}
 
@@ -132,21 +132,21 @@ 
 	 * @param string $password New user password
 	 * @return \Aimeos\MShop\Customer\Item\Iface Aimeos customer item object
 	 */
-	protected function createCustomerItem( \Aimeos\MShop\Context\Item\Iface $context, $email, $password )
+	protected function createCustomerItem(\Aimeos\MShop\Context\Item\Iface $context, $email, $password)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
 
 		try {
-			$item = $manager->findItem( $email );
-		} catch( \Aimeos\MShop\Exception $e ) {
+			$item = $manager->findItem($email);
+		} catch (\Aimeos\MShop\Exception $e) {
 			$item = $manager->createItem();
 		}
 
-		$item->setCode( $email );
-		$item->getPaymentAddress()->setEmail( $email );
-		$item->setPassword( $password );
+		$item->setCode($email);
+		$item->getPaymentAddress()->setEmail($email);
+		$item->setPassword($password);
 
-		$manager->saveItem( $item );
+		$manager->saveItem($item);
 
 		return $item;
 	}
@@ -160,8 +160,8 @@ 
 	protected function getArguments()
 	{
 		return array(
-			array( 'email', InputArgument::REQUIRED, 'E-mail address of the account that should be created' ),
-			array( 'site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default unittest" (none for all)' ),
+			array('email', InputArgument::REQUIRED, 'E-mail address of the account that should be created'),
+			array('site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default unittest" (none for all)'),
 		);
 	}
 
@@ -173,21 +173,21 @@ 
 	 * @param string $code Unique customer group code
 	 * @return \Aimeos\MShop\Customer\Item\Group\Iface Aimeos customer group item object
 	 */
-	protected function getGroupItem( \Aimeos\MShop\Context\Item\Iface $context, $code )
+	protected function getGroupItem(\Aimeos\MShop\Context\Item\Iface $context, $code)
 	{
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'group' );
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('group');
 
 		try
 		{
-			$item = $manager->findItem( $code );
+			$item = $manager->findItem($code);
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
 			$item = $manager->createItem();
-			$item->setLabel( $code );
-			$item->setCode( $code );
+			$item->setLabel($code);
+			$item->setCode($code);
 
-			$manager->saveItem( $item );
+			$manager->saveItem($item);
 		}
 
 		return $item;
@@ -202,8 +202,8 @@ 
 	protected function getOptions()
 	{
 		return array(
-				array( 'password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)' ),
-				array( 'admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges' ),
+				array('password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)'),
+				array('admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges'),
 		);
 	}
 }

src/Aimeos/Shop/Base/Context.php

Braces +1 added lines, -2 removed lines

@@ -163,8 +163,7 @@
 				$site = \Route::input( 'site', 'default' );
 				$lang = \Route::input( 'locale', '' );
 				$currency = \Route::input( 'currency', '' );
-			}
-			else
+			} else
 			{
 				$site = 'default';
 				$lang = $currency = '';

Spacing +43 added lines, -43 removed lines

@@ -49,7 +49,7 @@ 
 	 * @param \Illuminate\Contracts\Config\Repository $config Configuration object
 	 * @param \Illuminate\Session\Store $session Laravel session object
 	 */
-	public function __construct( \Illuminate\Contracts\Config\Repository $config, \Illuminate\Session\Store $session )
+	public function __construct(\Illuminate\Contracts\Config\Repository $config, \Illuminate\Session\Store $session)
 	{
 		$this->config = $config;
 		$this->session = $session;
@@ -62,48 +62,48 @@ 
 	 * @param boolean $locale True to add locale object to context, false if not
 	 * @return \Aimeos\MShop\Context\Item\Iface Context object
 	 */
-	public function get( $locale = true )
+	public function get($locale = true)
 	{
-		if( self::$context === null )
+		if (self::$context === null)
 		{
 			$context = new \Aimeos\MShop\Context\Item\Standard();
 
 			$config = $this->getConfig();
-			$context->setConfig( $config );
+			$context->setConfig($config);
 
-			$dbm = new \Aimeos\MW\DB\Manager\PDO( $config );
-			$context->setDatabaseManager( $dbm );
+			$dbm = new \Aimeos\MW\DB\Manager\PDO($config);
+			$context->setDatabaseManager($dbm);
 
-			$fs = new \Aimeos\MW\Filesystem\Manager\Laravel( app( 'filesystem' ), $config, storage_path( 'aimeos' ) );
-			$context->setFilesystemManager( $fs );
+			$fs = new \Aimeos\MW\Filesystem\Manager\Laravel(app('filesystem'), $config, storage_path('aimeos'));
+			$context->setFilesystemManager($fs);
 
-			$mail = new \Aimeos\MW\Mail\Swift( function() { return app( 'mailer' )->getSwiftMailer(); } );
-			$context->setMail( $mail );
+			$mail = new \Aimeos\MW\Mail\Swift(function() { return app('mailer')->getSwiftMailer(); } );
+			$context->setMail($mail);
 
-			$logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager( $context );
-			$context->setLogger( $logger );
+			$logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager($context);
+			$context->setLogger($logger);
 
-			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context );
-			$context->setCache( $cache );
+			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context);
+			$context->setCache($cache);
 
 			self::$context = $context;
 		}
 
 		$context = self::$context;
 
-		if( $locale === true )
+		if ($locale === true)
 		{
-			$localeItem = $this->getLocale( $context );
+			$localeItem = $this->getLocale($context);
 			$langid = $localeItem->getLanguageId();
 
-			$context->setLocale( $localeItem );
-			$context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $langid ) ) );
+			$context->setLocale($localeItem);
+			$context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($langid)));
 		}
 
-		$session = new \Aimeos\MW\Session\Laravel5( $this->session );
-		$context->setSession( $session );
+		$session = new \Aimeos\MW\Session\Laravel5($this->session);
+		$context->setSession($session);
 
-		$this->addUser( $context );
+		$this->addUser($context);
 
 		return $context;
 	}
@@ -114,20 +114,20 @@ 
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 */
-	protected function addUser( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addUser(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		if( ( $userid = Auth::id() ) !== null )
+		if (($userid = Auth::id()) !== null)
 		{
-			$context->setUserId( $userid );
-			$context->setGroupIds( function() use ( $context, $userid )
+			$context->setUserId($userid);
+			$context->setGroupIds(function() use ($context, $userid)
 			{
-				$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
-				return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups();
+				$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
+				return $manager->getItem($userid, array('customer/group'))->getGroups();
 			} );
 		}
 
-		if( ( $user = Auth::user() ) !== null ) {
-			$context->setEditor( $user->name );
+		if (($user = Auth::user()) !== null) {
+			$context->setEditor($user->name);
 		}
 	}
 
@@ -139,13 +139,13 @@ 
 	 */
 	protected function getConfig()
 	{
-		$conf = $this->config->get( 'shop' );
+		$conf = $this->config->get('shop');
 
-		$configPaths = app( '\Aimeos\Shop\Base\Aimeos' )->get()->getConfigPaths( 'mysql' );
-		$config = new \Aimeos\MW\Config\PHPArray( $conf, $configPaths );
+		$configPaths = app('\Aimeos\Shop\Base\Aimeos')->get()->getConfigPaths('mysql');
+		$config = new \Aimeos\MW\Config\PHPArray($conf, $configPaths);
 
-		if( function_exists( 'apc_store' ) === true && $this->config->get( 'shop.apc_enabled', false ) == true ) {
-			$config = new \Aimeos\MW\Config\Decorator\APC( $config, $this->config->get( 'shop.apc_prefix', 'laravel:' ) );
+		if (function_exists('apc_store') === true && $this->config->get('shop.apc_enabled', false) == true) {
+			$config = new \Aimeos\MW\Config\Decorator\APC($config, $this->config->get('shop.apc_prefix', 'laravel:'));
 		}
 
 		return $config;
@@ -158,15 +158,15 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item object
 	 */
-	protected function getLocale( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function getLocale(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		if( $this->locale === null )
+		if ($this->locale === null)
 		{
-			if( Route::current() !== null )
+			if (Route::current() !== null)
 			{
-				$site = Route::input( 'site', 'default' );
-				$lang = Route::input( 'locale', '' );
-				$currency = Route::input( 'currency', '' );
+				$site = Route::input('site', 'default');
+				$lang = Route::input('locale', '');
+				$currency = Route::input('currency', '');
 			}
 			else
 			{
@@ -174,10 +174,10 @@ 
 				$lang = $currency = '';
 			}
 
-			$disableSites = $this->config->has( 'shop.disableSites' );
+			$disableSites = $this->config->has('shop.disableSites');
 
-			$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
-			$this->locale = $localeManager->bootstrap( $site, $lang, $currency, $disableSites );
+			$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
+			$this->locale = $localeManager->bootstrap($site, $lang, $currency, $disableSites);
 		}
 
 		return $this->locale;

src/config/shop.php

Spacing +17 added lines, -17 removed lines

@@ -3,7 +3,7 @@ 
 return array(
 	'apc_enabled' => false,
 	'apc_prefix' => 'laravel:',
-	'extdir' => ( is_dir(base_path('ext')) ? base_path('ext') : dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'ext' ),
+	'extdir' => (is_dir(base_path('ext')) ? base_path('ext') : dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'ext'),
 	'uploaddir' => '/',
 
 	'routes' => array(
@@ -14,16 +14,16 @@ 
 	),
 
 	'page' => array(
-		'account-index' => array( 'account/history','account/favorite','account/watch','basket/mini','catalog/session' ),
-		'basket-index' => array( 'basket/standard','basket/related' ),
-		'catalog-count' => array( 'catalog/count' ),
-		'catalog-detail' => array( 'basket/mini','catalog/stage','catalog/detail','catalog/session' ),
-		'catalog-list' => array( 'basket/mini','catalog/filter','catalog/stage','catalog/lists' ),
-		'catalog-stock' => array( 'catalog/stock' ),
-		'catalog-suggest' => array( 'catalog/suggest' ),
-		'checkout-confirm' => array( 'checkout/confirm' ),
-		'checkout-index' => array( 'checkout/standard' ),
-		'checkout-update' => array( 'checkout/update'),
+		'account-index' => array('account/history', 'account/favorite', 'account/watch', 'basket/mini', 'catalog/session'),
+		'basket-index' => array('basket/standard', 'basket/related'),
+		'catalog-count' => array('catalog/count'),
+		'catalog-detail' => array('basket/mini', 'catalog/stage', 'catalog/detail', 'catalog/session'),
+		'catalog-list' => array('basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists'),
+		'catalog-stock' => array('catalog/stock'),
+		'catalog-suggest' => array('catalog/suggest'),
+		'checkout-confirm' => array('checkout/confirm'),
+		'checkout-index' => array('checkout/standard'),
+		'checkout-update' => array('checkout/update'),
 	),
 
 	'resource' => array(
@@ -34,19 +34,19 @@ 
 			'database' => env('DB_DATABASE', 'laravel'),
 			'username' => env('DB_USERNAME', 'root'),
 			'password' => env('DB_PASSWORD', ''),
-			'stmt' => array( "SET NAMES 'utf8'", "SET SESSION sql_mode='ANSI'" ),
+			'stmt' => array("SET NAMES 'utf8'", "SET SESSION sql_mode='ANSI'"),
 			'opt-persistent' => 0,
 			'limit' => 2,
 		),
 		'fs' => array(
 			'adapter' => 'Standard',
 			'basedir' => public_path(),
-			'tempdir' => storage_path( 'aimeos' ),
+			'tempdir' => storage_path('aimeos'),
 		),
 		'fs-admin' => array(
 			'adapter' => 'Standard',
-			'basedir' => public_path( 'uploads' ),
-			'tempdir' => storage_path( 'aimeos' ),
+			'basedir' => public_path('uploads'),
+			'tempdir' => storage_path('aimeos'),
 		),
 		/* 'fs-media' => array(
 			'adapter' => 'Standard',
@@ -191,7 +191,7 @@ 
 				'default' => array(
 					'mimeicon' => array(
 						# Directory where icons for the mime types stored
-						'directory' => public_path( '/packages/aimeos/shop/mimeicons' ),
+						'directory' => public_path('/packages/aimeos/shop/mimeicons'),
 						# File extension of mime type icons
 						'extension' => '.png'
 					),
@@ -234,7 +234,7 @@ 
 						# in the "maxwidth" parameter
 						# maxheight: 280
 					),
-					'tempdir' => storage_path( 'aimeos' ),
+					'tempdir' => storage_path('aimeos'),
 				),
 			),
 			'product' => array(

src/Aimeos/Shop/Controller/JqadmController.php

Braces +1 added lines, -2 removed lines

@@ -207,8 +207,7 @@
 			$localeItem = $localeManager->bootstrap( $sitecode, '', '', false );
 			$localeItem->setLanguageId( null );
 			$localeItem->setCurrencyId( null );
-		}
-		catch( \Aimeos\MShop\Locale\Exception $e )
+		} catch( \Aimeos\MShop\Locale\Exception $e )
 		{
 			$localeItem = $localeManager->createItem();
 		}

Doc Comments +7 added lines, -13 removed lines

@@ -30,9 +30,8 @@ 
 	 * Returns the HTML code for a copy of a resource object
 	 *
 	 * @param string Resource location, e.g. "product"
-	 * @param string $sitecode Unique site code
 	 * @param integer $id Unique resource ID
-	 * @return string Generated output
+	 * @return \Illuminate\Contracts\View\View Generated output
 	 */
 	public function copyAction( $site = 'default', $resource, $id )
 	{
@@ -49,8 +48,7 @@ 
 	 * Returns the HTML code for a new resource object
 	 *
 	 * @param string Resource location, e.g. "product"
-	 * @param string $sitecode Unique site code
-	 * @return string Generated output
+	 * @return \Illuminate\Contracts\View\View Generated output
 	 */
 	public function createAction( $site = 'default', $resource )
 	{
@@ -67,9 +65,8 @@ 
 	 * Deletes the resource object or a list of resource objects
 	 *
 	 * @param string Resource location, e.g. "product"
-	 * @param string $sitecode Unique site code
 	 * @param integer $id Unique resource ID
-	 * @return string Generated output
+	 * @return \Illuminate\Contracts\View\View Generated output
 	 */
 	public function deleteAction( $site = 'default', $resource, $id )
 	{
@@ -86,9 +83,8 @@ 
 	 * Returns the HTML code for the requested resource object
 	 *
 	 * @param string Resource location, e.g. "product"
-	 * @param string $sitecode Unique site code
 	 * @param integer $id Unique resource ID
-	 * @return string Generated output
+	 * @return \Illuminate\Contracts\View\View Generated output
 	 */
 	public function getAction( $site = 'default', $resource, $id )
 	{
@@ -105,8 +101,7 @@ 
 	 * Saves a new resource object
 	 *
 	 * @param string Resource location, e.g. "product"
-	 * @param string $sitecode Unique site code
-	 * @return string Generated output
+	 * @return \Illuminate\Contracts\View\View Generated output
 	 */
 	public function saveAction( $site = 'default', $resource )
 	{
@@ -123,8 +118,7 @@ 
 	 * Returns the HTML code for a list of resource objects
 	 *
 	 * @param string Resource location, e.g. "product"
-	 * @param string $sitecode Unique site code
-	 * @return string Generated output
+	 * @return \Illuminate\Contracts\View\View Generated output
 	 */
 	public function searchAction( $site = 'default', $resource )
 	{
@@ -141,7 +135,7 @@ 
 	 * Returns the resource controller
 	 *
 	 * @param string $sitecode Unique site code
-	 * @return \Aimeos\MShop\Context\Item\Iface Context item
+	 * @return \Aimeos\Admin\JQAdm\Iface Context item
 	 */
 	protected function createClient( $sitecode, $resource )
 	{

Spacing +51 added lines, -51 removed lines

@@ -34,14 +34,14 @@ 
 	 * @param integer $id Unique resource ID
 	 * @return string Generated output
 	 */
-	public function copyAction( $site = 'default', $resource, $id )
+	public function copyAction($site = 'default', $resource, $id)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin' );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin');
 		}
 
-		$cntl = $this->createClient( $site, $resource );
-		return $this->getHtml( $site, $cntl->copy( $id ) );
+		$cntl = $this->createClient($site, $resource);
+		return $this->getHtml($site, $cntl->copy($id));
 	}
 
 
@@ -52,14 +52,14 @@ 
 	 * @param string $sitecode Unique site code
 	 * @return string Generated output
 	 */
-	public function createAction( $site = 'default', $resource )
+	public function createAction($site = 'default', $resource)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin' );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin');
 		}
 
-		$cntl = $this->createClient( $site, $resource );
-		return $this->getHtml( $site, $cntl->create() );
+		$cntl = $this->createClient($site, $resource);
+		return $this->getHtml($site, $cntl->create());
 	}
 
 
@@ -71,14 +71,14 @@ 
 	 * @param integer $id Unique resource ID
 	 * @return string Generated output
 	 */
-	public function deleteAction( $site = 'default', $resource, $id )
+	public function deleteAction($site = 'default', $resource, $id)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin' );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin');
 		}
 
-		$cntl = $this->createClient( $site, $resource );
-		return $this->getHtml( $site, $cntl->delete( $id ) . $cntl->search() );
+		$cntl = $this->createClient($site, $resource);
+		return $this->getHtml($site, $cntl->delete($id) . $cntl->search());
 	}
 
 
@@ -90,14 +90,14 @@ 
 	 * @param integer $id Unique resource ID
 	 * @return string Generated output
 	 */
-	public function getAction( $site = 'default', $resource, $id )
+	public function getAction($site = 'default', $resource, $id)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin' );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin');
 		}
 
-		$cntl = $this->createClient( $site, $resource );
-		return $this->getHtml( $site, $cntl->get( $id ) );
+		$cntl = $this->createClient($site, $resource);
+		return $this->getHtml($site, $cntl->get($id));
 	}
 
 
@@ -108,14 +108,14 @@ 
 	 * @param string $sitecode Unique site code
 	 * @return string Generated output
 	 */
-	public function saveAction( $site = 'default', $resource )
+	public function saveAction($site = 'default', $resource)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin' );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin');
 		}
 
-		$cntl = $this->createClient( $site, $resource );
-		return $this->getHtml( $site, ( $cntl->save() ? : $cntl->search() ) );
+		$cntl = $this->createClient($site, $resource);
+		return $this->getHtml($site, ($cntl->save() ?: $cntl->search()));
 	}
 
 
@@ -126,14 +126,14 @@ 
 	 * @param string $sitecode Unique site code
 	 * @return string Generated output
 	 */
-	public function searchAction( $site = 'default', $resource )
+	public function searchAction($site = 'default', $resource)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin' );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin');
 		}
 
-		$cntl = $this->createClient( $site, $resource );
-		return $this->getHtml( $site, $cntl->search() );
+		$cntl = $this->createClient($site, $resource);
+		return $this->getHtml($site, $cntl->search());
 	}
 
 
@@ -143,20 +143,20 @@ 
 	 * @param string $sitecode Unique site code
 	 * @return \Aimeos\MShop\Context\Item\Iface Context item
 	 */
-	protected function createClient( $sitecode, $resource )
+	protected function createClient($sitecode, $resource)
 	{
-		$lang = Input::get( 'lang', config( 'app.locale', 'en' ) );
+		$lang = Input::get('lang', config('app.locale', 'en'));
 
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' );
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
+		$templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates');
 
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false );
-		$context = $this->setLocale( $context, $sitecode, $lang );
+		$context = app('\Aimeos\Shop\Base\Context')->get(false);
+		$context = $this->setLocale($context, $sitecode, $lang);
 
-		$view = app( '\Aimeos\Shop\Base\View' )->create( $context->getConfig(), $templatePaths, $lang );
-		$context->setView( $view );
+		$view = app('\Aimeos\Shop\Base\View')->create($context->getConfig(), $templatePaths, $lang);
+		$context->setView($view);
 
-		return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource );
+		return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource);
 	}
 
 
@@ -167,12 +167,12 @@ 
 	 * @param string $content Content from admin client
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
 	 */
-	protected function getHtml( $site, $content )
+	protected function getHtml($site, $content)
 	{
-		$version = app( '\Aimeos\Shop\Base\Aimeos' )->getVersion();
-		$content = str_replace( ['{type}', '{version}'], ['Laravel', $version], $content );
+		$version = app('\Aimeos\Shop\Base\Aimeos')->getVersion();
+		$content = str_replace(['{type}', '{version}'], ['Laravel', $version], $content);
 
-		return View::make( 'shop::jqadm.index', array( 'content' => $content ) );
+		return View::make('shop::jqadm.index', array('content' => $content));
 	}
 
 
@@ -184,23 +184,23 @@ 
 	 * @param string $lang ISO language code, e.g. "en" or "en_GB"
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $lang = null )
+	protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $lang = null)
 	{
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
 
 		try
 		{
-			$localeItem = $localeManager->bootstrap( $sitecode, '', '', false );
-			$localeItem->setLanguageId( null );
-			$localeItem->setCurrencyId( null );
+			$localeItem = $localeManager->bootstrap($sitecode, '', '', false);
+			$localeItem->setLanguageId(null);
+			$localeItem->setCurrencyId(null);
 		}
-		catch( \Aimeos\MShop\Locale\Exception $e )
+		catch (\Aimeos\MShop\Locale\Exception $e)
 		{
 			$localeItem = $localeManager->createItem();
 		}
 
-		$context->setLocale( $localeItem );
-		$context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang ) ) );
+		$context->setLocale($localeItem);
+		$context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang)));
 
 		return $context;
 	}

src/Aimeos/Shop/Base/Page.php

Spacing +12 added lines, -12 removed lines

@@ -47,8 +47,8 @@ 
 	 * @param \Aimeos\Shop\Base\Context $context Context object
 	 * @param \Aimeos\Shop\Base\View $view View object
 	 */
-	public function __construct( \Illuminate\Contracts\Config\Repository $config,
-		\Aimeos\Shop\Base\Aimeos $aimeos, \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\View $view )
+	public function __construct(\Illuminate\Contracts\Config\Repository $config,
+		\Aimeos\Shop\Base\Aimeos $aimeos, \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\View $view)
 	{
 		$this->config = $config;
 		$this->aimeos = $aimeos;
@@ -63,23 +63,23 @@ 
 	 * @param string $pageName Name of the configured page
 	 * @return array Associative list with body and header output separated by client name
 	 */
-	public function getSections( $pageName )
+	public function getSections($pageName)
 	{
 		$context = $this->context->get();
 		$langid = $context->getLocale()->getLanguageId();
-		$tmplPaths = $this->aimeos->get()->getCustomPaths( 'client/html/templates' );
-		$view = $this->view->create( $context->getConfig(), $tmplPaths, $langid );
-		$context->setView( $view );
+		$tmplPaths = $this->aimeos->get()->getCustomPaths('client/html/templates');
+		$view = $this->view->create($context->getConfig(), $tmplPaths, $langid);
+		$context->setView($view);
 
-		$pagesConfig = $this->config->get( 'shop.page', array() );
-		$result = array( 'aibody' => array(), 'aiheader' => array() );
+		$pagesConfig = $this->config->get('shop.page', array());
+		$result = array('aibody' => array(), 'aiheader' => array());
 
-		if( isset( $pagesConfig[$pageName] ) )
+		if (isset($pagesConfig[$pageName]))
 		{
-			foreach( (array) $pagesConfig[$pageName] as $clientName )
+			foreach ((array) $pagesConfig[$pageName] as $clientName)
 			{
-				$client = \Aimeos\Client\Html\Factory::createClient( $context, $tmplPaths, $clientName );
-				$client->setView( clone $view );
+				$client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName);
+				$client->setView(clone $view);
 				$client->process();
 
 				$result['aibody'][$clientName] = $client->getBody();

src/Aimeos/Shop/Base/Support.php

Spacing +10 added lines, -10 removed lines

@@ -29,7 +29,7 @@ 
 	 *
 	 * @param \Aimeos\Shop\Base\Context $context Context object
 	 */
-	public function __construct( \Aimeos\Shop\Base\Context $context )
+	public function __construct(\Aimeos\Shop\Base\Context $context)
 	{
 		$this->context = $context;
 	}
@@ -42,21 +42,21 @@ 
 	 * @param string $groupcode Unique user/customer group code
 	 * @return boolean True if user is part of the group, false if not
 	 */
-	public function checkGroup( $userid, $groupcode )
+	public function checkGroup($userid, $groupcode)
 	{
 		$context = $this->context->get();
-		$group = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' )->findItem( $groupcode );
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
+		$group = \Aimeos\MShop\Factory::createManager($context, 'customer/group')->findItem($groupcode);
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'customer.lists.parentid', $userid ),
-			$search->compare( '==', 'customer.lists.refid', $group->getId() ),
-			$search->compare( '==', 'customer.lists.domain', 'customer/group' ),
+			$search->compare('==', 'customer.lists.parentid', $userid),
+			$search->compare('==', 'customer.lists.refid', $group->getId()),
+			$search->compare('==', 'customer.lists.domain', 'customer/group'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 1);
 
-		return (bool) count( $manager->searchItems( $search ) );
+		return (bool) count($manager->searchItems($search));
 	}
 }
\ No newline at end of file

src/Aimeos/Shop/Controller/ExtadmController.php

Doc Comments +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
 	 * Creates a list of all available translations.
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
-	 * @return array List of language IDs with labels
+	 * @return string List of language IDs with labels
 	 */
 	protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context )
 	{

Spacing +71 added lines, -71 removed lines

@@ -34,63 +34,63 @@ 
 	 * @param \Illuminate\Http\Request $request Laravel request object
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
 	 */
-	public function indexAction( Request $request )
+	public function indexAction(Request $request)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin' );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin');
 		}
 
-		$site = Route::input( 'site', 'default' );
-		$lang = Input::get( 'lang', config( 'app.locale', 'en' ) );
+		$site = Route::input('site', 'default');
+		$lang = Input::get('lang', config('app.locale', 'en'));
 
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' );
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos');
 
 		$bootstrap = $aimeos->get();
-		$cntlPaths = $bootstrap->getCustomPaths( 'controller/extjs' );
+		$cntlPaths = $bootstrap->getCustomPaths('controller/extjs');
 
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false );
-		$context = $this->setLocale( $context, $site, $lang );
+		$context = app('\Aimeos\Shop\Base\Context')->get(false);
+		$context = $this->setLocale($context, $site, $lang);
 
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
 		$cssFiles = array();
 
-		foreach( $bootstrap->getCustomPaths( 'admin/extjs' ) as $base => $paths )
+		foreach ($bootstrap->getCustomPaths('admin/extjs') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
 				$jsbAbsPath = $base . '/' . $path;
 
-				if( !is_file( $jsbAbsPath ) ) {
-					throw new \Exception( sprintf( 'JSB2 file "%1$s" not found', $jsbAbsPath ) );
+				if (!is_file($jsbAbsPath)) {
+					throw new \Exception(sprintf('JSB2 file "%1$s" not found', $jsbAbsPath));
 				}
 
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $path ) );
-				$cssFiles = array_merge( $cssFiles, $jsb2->getUrls( 'css' ) );
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($path));
+				$cssFiles = array_merge($cssFiles, $jsb2->getUrls('css'));
 			}
 		}
 
-		$jqadmUrl = route( 'aimeos_shop_jqadm_search', array( 'site' => $site, 'resource' => 'product' ) );
-		$jsonUrl = route( 'aimeos_shop_extadm_json', array( 'site' => $site, '_token' => csrf_token() ) );
-		$adminUrl = route( 'aimeos_shop_extadm', array( 'site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>' ) );
+		$jqadmUrl = route('aimeos_shop_jqadm_search', array('site' => $site, 'resource' => 'product'));
+		$jsonUrl = route('aimeos_shop_extadm_json', array('site' => $site, '_token' => csrf_token()));
+		$adminUrl = route('aimeos_shop_extadm', array('site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>'));
 
 		$vars = array(
 			'lang' => $lang,
 			'cssFiles' => $cssFiles,
-			'languages' => $this->getJsonLanguages( $context),
-			'config' => $this->getJsonClientConfig( $context ),
-			'site' => $this->getJsonSiteItem( $context, $site ),
-			'i18nContent' => $this->getJsonClientI18n( $bootstrap->getI18nPaths(), $lang ),
+			'languages' => $this->getJsonLanguages($context),
+			'config' => $this->getJsonClientConfig($context),
+			'site' => $this->getJsonSiteItem($context, $site),
+			'i18nContent' => $this->getJsonClientI18n($bootstrap->getI18nPaths(), $lang),
 			'searchSchemas' => $controller->getJsonSearchSchemas(),
 			'itemSchemas' => $controller->getJsonItemSchemas(),
-			'smd' => $controller->getJsonSmd( $jsonUrl ),
-			'urlTemplate' => str_replace( ['<', '>'], ['{', '}'], urldecode( $adminUrl ) ),
-			'uploaddir' => config( 'shop::uploaddir' ),
-			'activeTab' => Input::get( 'tab', 0 ),
+			'smd' => $controller->getJsonSmd($jsonUrl),
+			'urlTemplate' => str_replace(['<', '>'], ['{', '}'], urldecode($adminUrl)),
+			'uploaddir' => config('shop::uploaddir'),
+			'activeTab' => Input::get('tab', 0),
 			'version' => $aimeos->getVersion(),
 			'jqadmurl' => $jqadmUrl,
 		);
 
-		return View::make( 'shop::extadm.index', $vars );
+		return View::make('shop::extadm.index', $vars);
 	}
 
 
@@ -101,20 +101,20 @@ 
 	 */
 	public function doAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin' );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin');
 		}
 
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
-		$cntlPaths = $aimeos->getCustomPaths( 'controller/extjs' );
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
+		$cntlPaths = $aimeos->getCustomPaths('controller/extjs');
 
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false );
-		$context = $this->setLocale( $context );
+		$context = app('\Aimeos\Shop\Base\Context')->get(false);
+		$context = $this->setLocale($context);
 
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
 
-		$response = $controller->process( Input::instance()->request->all(), 'php://input' );
-		return View::make( 'shop::extadm.do', array( 'output' => $response ) );
+		$response = $controller->process(Input::instance()->request->all(), 'php://input');
+		return View::make('shop::extadm.do', array('output' => $response));
 	}
 
 
@@ -125,32 +125,32 @@ 
 	 */
 	public function fileAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin' );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin');
 		}
 
 		$contents = '';
 		$jsFiles = array();
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
 
-		foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths )
+		foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
 				$jsbAbsPath = $base . '/' . $path;
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
-				$jsFiles = array_merge( $jsFiles, $jsb2->getFiles( 'js' ) );
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
+				$jsFiles = array_merge($jsFiles, $jsb2->getFiles('js'));
 			}
 		}
 
-		foreach( $jsFiles as $file )
+		foreach ($jsFiles as $file)
 		{
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
+			if (($content = file_get_contents($file)) !== false) {
 				$contents .= $content;
 			}
 		}
 
-		return response( $contents )->header( 'Content-Type', 'application/javascript' );
+		return response($contents)->header('Content-Type', 'application/javascript');
 	}
 
 
@@ -160,15 +160,15 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return array List of language IDs with labels
 	 */
-	protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function getJsonLanguages(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$result = array();
 
-		foreach( app( '\Aimeos\Shop\Base\Aimeos' )->get()->getI18nList( 'admin' ) as $id ) {
-			$result[] = array( 'id' => $id, 'label' => $id );
+		foreach (app('\Aimeos\Shop\Base\Aimeos')->get()->getI18nList('admin') as $id) {
+			$result[] = array('id' => $id, 'label' => $id);
 		}
 
-		return json_encode( $result );
+		return json_encode($result);
 	}
 
 
@@ -178,10 +178,10 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item object
 	 * @return string JSON encoded configuration object
 	 */
-	protected function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function getJsonClientConfig(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$config = $context->getConfig()->get( 'admin/extjs', array() );
-		return json_encode( array( 'admin' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT );
+		$config = $context->getConfig()->get('admin/extjs', array());
+		return json_encode(array('admin' => array('extjs' => $config)), JSON_FORCE_OBJECT);
 	}
 
 
@@ -192,16 +192,16 @@ 
 	 * @param string $lang ISO language code like "en" or "en_GB"
 	 * @return string JSON encoded translation object
 	 */
-	protected function getJsonClientI18n( array $i18nPaths, $lang )
+	protected function getJsonClientI18n(array $i18nPaths, $lang)
 	{
-		$i18n = new \Aimeos\MW\Translation\Zend2( $i18nPaths, 'gettext', $lang, array( 'disableNotices' => true ) );
+		$i18n = new \Aimeos\MW\Translation\Zend2($i18nPaths, 'gettext', $lang, array('disableNotices' => true));
 
 		$content = array(
-			'admin' => $i18n->getAll( 'admin' ),
-			'admin/ext' => $i18n->getAll( 'admin/ext' ),
+			'admin' => $i18n->getAll('admin'),
+			'admin/ext' => $i18n->getAll('admin/ext'),
 		);
 
-		return json_encode( $content, JSON_FORCE_OBJECT );
+		return json_encode($content, JSON_FORCE_OBJECT);
 	}
 
 
@@ -213,19 +213,19 @@ 
 	 * @return string JSON encoded site item object
 	 * @throws Exception If no site item was found for the code
 	 */
-	protected function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site )
+	protected function getJsonSiteItem(\Aimeos\MShop\Context\Item\Iface $context, $site)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');
 
 		$criteria = $manager->createSearch();
-		$criteria->setConditions( $criteria->compare( '==', 'locale.site.code', $site ) );
-		$items = $manager->searchItems( $criteria );
+		$criteria->setConditions($criteria->compare('==', 'locale.site.code', $site));
+		$items = $manager->searchItems($criteria);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( sprintf( 'No site found for code "%1$s"', $site ) );
+		if (($item = reset($items)) === false) {
+			throw new \Exception(sprintf('No site found for code "%1$s"', $site));
 		}
 
-		return json_encode( $item->toArray() );
+		return json_encode($item->toArray());
 	}
 
 
@@ -237,17 +237,17 @@ 
 	 * @param string $locale ISO language code, e.g. "en" or "en_GB"
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null )
+	protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null)
 	{
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
 
 		try {
-			$localeItem = $localeManager->bootstrap( $sitecode, $locale, '', false );
-		} catch( \Aimeos\MShop\Locale\Exception $e ) {
+			$localeItem = $localeManager->bootstrap($sitecode, $locale, '', false);
+		} catch (\Aimeos\MShop\Locale\Exception $e) {
 			$localeItem = $localeManager->createItem();
 		}
 
-		$context->setLocale( $localeItem );
+		$context->setLocale($localeItem);
 
 		return $context;
 	}

src/Aimeos/Shop/Command/SetupCommand.php

Spacing +25 added lines, -25 removed lines

@@ -36,31 +36,31 @@ 
 	 */
 	public function fire()
 	{
-		$ctx = $this->getLaravel()->make( '\Aimeos\Shop\Base\Context' )->get( false );
-		$ctx->setEditor( 'aimeos:setup' );
+		$ctx = $this->getLaravel()->make('\Aimeos\Shop\Base\Context')->get(false);
+		$ctx->setEditor('aimeos:setup');
 
 		$config = $ctx->getConfig();
-		$site = $this->argument( 'site' );
-		$template = $this->argument( 'tplsite' );
+		$site = $this->argument('site');
+		$template = $this->argument('tplsite');
 
-		$config->set( 'setup/site', $site );
-		$dbconfig = $this->getDbConfig( $config );
-		$this->setOptions( $config );
+		$config->set('setup/site', $site);
+		$dbconfig = $this->getDbConfig($config);
+		$this->setOptions($config);
 
-		$taskPaths = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get()->getSetupPaths( $template );
+		$taskPaths = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get()->getSetupPaths($template);
 
 		$includePaths = $taskPaths;
 		$includePaths[] = get_include_path();
 
-		if( set_include_path( implode( PATH_SEPARATOR, $includePaths ) ) === false ) {
-			throw new Exception( 'Unable to extend include path' );
+		if (set_include_path(implode(PATH_SEPARATOR, $includePaths)) === false) {
+			throw new Exception('Unable to extend include path');
 		}
 
-		$manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx );
+		$manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx);
 
-		$this->info( sprintf( 'Initializing or updating the Aimeos database tables for site "%1$s"', $site ) );
+		$this->info(sprintf('Initializing or updating the Aimeos database tables for site "%1$s"', $site));
 
-		$manager->run( 'mysql' );
+		$manager->run('mysql');
 	}
 
 
@@ -72,8 +72,8 @@ 
 	protected function getArguments()
 	{
 		return array(
-			array( 'site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default' ),
-			array( 'tplsite', InputArgument::OPTIONAL, 'Site used as template for creating the new one', 'default' ),
+			array('site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default'),
+			array('tplsite', InputArgument::OPTIONAL, 'Site used as template for creating the new one', 'default'),
 		);
 	}
 
@@ -86,7 +86,7 @@ 
 	protected function getOptions()
 	{
 		return array(
-			array( 'option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array() ),
+			array('option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array()),
 		);
 	}
 
@@ -97,14 +97,14 @@ 
 	 * @param \Aimeos\MW\Config\Iface $conf Config object
 	 * @return array Multi-dimensional associative list of database configuration parameters
 	 */
-	protected function getDbConfig( \Aimeos\MW\Config\Iface $conf )
+	protected function getDbConfig(\Aimeos\MW\Config\Iface $conf)
 	{
-		$dbconfig = $conf->get( 'resource', array() );
+		$dbconfig = $conf->get('resource', array());
 
-		foreach( $dbconfig as $rname => $dbconf )
+		foreach ($dbconfig as $rname => $dbconf)
 		{
-			if( strncmp( $rname, 'db', 2 ) !== 0 ) {
-				unset( $dbconfig[$rname] );
+			if (strncmp($rname, 'db', 2) !== 0) {
+				unset($dbconfig[$rname]);
 			}
 		}
 
@@ -119,12 +119,12 @@ 
 	 * @param array Associative list of database configurations
 	 * @throws \RuntimeException If the format of the options is invalid
 	 */
-	protected function setOptions( \Aimeos\MW\Config\Iface $conf )
+	protected function setOptions(\Aimeos\MW\Config\Iface $conf)
 	{
-		foreach( (array) $this->option( 'option' ) as $option )
+		foreach ((array) $this->option('option') as $option)
 		{
-			list( $name, $value ) = explode( ':', $option );
-			$conf->set( $name, $value );
+			list($name, $value) = explode(':', $option);
+			$conf->set($name, $value);
 		}
 	}
 }