aimeos / aimeos-laravel

src/Aimeos/Shop/Command/AbstractCommand.php

Spacing +7 added lines, -7 removed lines

@@ -22,19 +22,19 @@
 	 * @param string|array $sites Unique site codes
 	 * @return \Aimeos\MShop\Locale\Item\Site\Iface[] List of site items
 	 */
-	protected function getSiteItems( \Aimeos\MShop\Context\Item\Iface $context, $sites )
+	protected function getSiteItems(\Aimeos\MShop\Context\Item\Iface $context, $sites)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');
 		$search = $manager->createSearch();
 
-		if( is_scalar( $sites ) && $sites != '' ) {
-			$sites = explode( ' ', $sites );
+		if (is_scalar($sites) && $sites != '') {
+			$sites = explode(' ', $sites);
 		}
 
-		if( !empty( $sites ) ) {
-			$search->setConditions( $search->compare( '==', 'locale.site.code', $sites ) );
+		if (!empty($sites)) {
+			$search->setConditions($search->compare('==', 'locale.site.code', $sites));
 		}
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }
\ No newline at end of file

src/Aimeos/Shop/Controller/AccountController.php

Spacing +7 added lines, -7 removed lines

@@ -30,7 +30,7 @@ 
 	 */
 	public function indexAction()
 	{
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'account-index' );
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('account-index');
 		return View::make('shop::account.index', $params);
 	}
 
@@ -42,17 +42,17 @@ 
 	 */
 	public function downloadAction()
 	{
-		$context = app( '\Aimeos\Shop\Base\Context' )->get();
+		$context = app('\Aimeos\Shop\Base\Context')->get();
 		$langid = $context->getLocale()->getLanguageId();
 
-		$view = app( '\Aimeos\Shop\Base\View' )->create( $context, array(), $langid );
-		$context->setView( $view );
+		$view = app('\Aimeos\Shop\Base\View')->create($context, array(), $langid);
+		$context->setView($view);
 
-		$client = \Aimeos\Client\Html\Factory::createClient( $context, array(), 'account/download' );
-		$client->setView( $view );
+		$client = \Aimeos\Client\Html\Factory::createClient($context, array(), 'account/download');
+		$client->setView($view);
 		$client->process();
 
 		$response = $view->response();
-		return Response::make( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() );
+		return Response::make((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders());
 	}
 }
\ No newline at end of file

src/Aimeos/Shop/Base/Support.php

Spacing +19 added lines, -19 removed lines

@@ -39,7 +39,7 @@ 
 	 * @param \Aimeos\Shop\Base\Context $context Context provider
 	 * @param \Aimeos\Shop\Base\Locale $locale Locale provider
 	 */
-	public function __construct( \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale )
+	public function __construct(\Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale)
 	{
 		$this->context = $context;
 		$this->locale = $locale;
@@ -53,45 +53,45 @@ 
 	 * @param string|array $groupcodes Unique user/customer group codes that are allowed
 	 * @return boolean True if user is part of the group, false if not
 	 */
-	public function checkGroup( $userid, $groupcodes )
+	public function checkGroup($userid, $groupcodes)
 	{
-		$site = ( Route::current() ? Route::input( 'site', Input::get( 'site', 'default' ) ) : 'default' );
+		$site = (Route::current() ? Route::input('site', Input::get('site', 'default')) : 'default');
 
-		$context = $this->context->get( false );
-		$context->setLocale( $this->locale->getBackend( $context, $site ) );
+		$context = $this->context->get(false);
+		$context->setLocale($this->locale->getBackend($context, $site));
 
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.group.code', (array) $groupcodes ) );
-		$groupItems = $manager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'customer.group.code', (array) $groupcodes));
+		$groupItems = $manager->searchItems($search);
 
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'customer.lists.parentid', $userid ),
-			$search->compare( '==', 'customer.lists.refid', array_keys( $groupItems ) ),
-			$search->compare( '==', 'customer.lists.domain', 'customer/group' ),
+			$search->compare('==', 'customer.lists.parentid', $userid),
+			$search->compare('==', 'customer.lists.refid', array_keys($groupItems)),
+			$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));
 	}
 
 
-	public function getGroups( \Aimeos\MShop\Context\Item\Iface $context )
+	public function getGroups(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$list = array();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.group.id', $context->getGroupIds() ) );
+		$search->setConditions($search->compare('==', 'customer.group.id', $context->getGroupIds()));
 
-		foreach( $manager->searchItems( $search ) as $item ) {
+		foreach ($manager->searchItems($search) as $item) {
 			$list[] = $item->getCode();
 		}
 

src/Aimeos/Shop/Command/AccountCommand.php

Spacing +63 added lines, -63 removed lines

@@ -43,29 +43,29 @@ 
 	 */
 	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, 'command' );
-		$context->setEditor( 'aimeos:account' );
+		$context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false, 'command');
+		$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->addGroup( $context, $user, 'admin' );
+		if ($this->option('admin')) {
+			$this->addGroup($context, $user, 'admin');
 		}
 
-		if( $this->option( 'api' ) ) {
-			$this->addGroup( $context, $user, 'api' );
+		if ($this->option('api')) {
+			$this->addGroup($context, $user, 'api');
 		}
 
-		if( $this->option( 'editor' ) ) {
-			$this->addGroup( $context, $user, 'editor' );
+		if ($this->option('editor')) {
+			$this->addGroup($context, $user, 'editor');
 		}
 	}
 
@@ -77,33 +77,33 @@ 
 	 * @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\Factory::createManager( $context, 'customer/lists' );
-		$typeManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
+		$typeManager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists/type');
 
-		$typeid = $typeManager->findItem( 'default', array(), 'customer/group' )->getId();
+		$typeid = $typeManager->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);
 		}
 	}
 
@@ -115,23 +115,23 @@ 
 	 * @param \Aimeos\MShop\Customer\Item\Iface $user Aimeos customer object
 	 * @param string $group Unique customer group code
 	 */
-	protected function addGroup( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group )
+	protected function addGroup(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group)
 	{
-		$this->info( sprintf( 'Add "%1$s" group to user "%2$s" for sites', $group, $user->getCode() ) );
+		$this->info(sprintf('Add "%1$s" group to user "%2$s" for sites', $group, $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, $group );
-			$this->addListItem( $lcontext, $user->getId(), $groupItem->getId() );
+			$groupItem = $this->getGroupItem($lcontext, $group);
+			$this->addListItem($lcontext, $user->getId(), $groupItem->getId());
 		}
 	}
 
@@ -146,23 +146,23 @@ 
 	 * @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->setLabel( $email );
-		$item->getPaymentAddress()->setEmail( $email );
-		$item->setPassword( $password );
-		$item->setStatus( 1 );
+		$item->setCode($email);
+		$item->setLabel($email);
+		$item->getPaymentAddress()->setEmail($email);
+		$item->setPassword($password);
+		$item->setStatus(1);
 
-		$manager->saveItem( $item );
+		$manager->saveItem($item);
 
 		return $item;
 	}
@@ -176,8 +176,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)'),
 		);
 	}
 
@@ -189,21 +189,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;
@@ -218,10 +218,10 @@ 
 	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( 'api', null, InputOption::VALUE_NONE, 'If account should be able to access the APIs' ),
-			array( 'editor', null, InputOption::VALUE_NONE, 'If account should have limited editor 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'),
+			array('api', null, InputOption::VALUE_NONE, 'If account should be able to access the APIs'),
+			array('editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges'),
 		);
 	}
 }

src/Aimeos/Shop/Command/JobsCommand.php

Spacing +23 added lines, -23 removed lines

@@ -43,24 +43,24 @@ 
 	 */
 	public function fire()
 	{
-		$aimeos = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get();
+		$aimeos = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get();
 		$context = $this->getContext();
 
-		$jobs = explode( ' ', $this->argument( 'jobs' ) );
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
+		$jobs = explode(' ', $this->argument('jobs'));
+		$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->setLanguageId( null );
-			$localeItem->setCurrencyId( null );
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
+			$localeItem->setLanguageId(null);
+			$localeItem->setCurrencyId(null);
 
-			$context->setLocale( $localeItem );
+			$context->setLocale($localeItem);
 
-			$this->info( sprintf( 'Executing the Aimeos jobs for "%s"', $siteItem->getCode() ) );
+			$this->info(sprintf('Executing the Aimeos jobs for "%s"', $siteItem->getCode()));
 
-			foreach( $jobs as $jobname ) {
-				\Aimeos\Controller\Jobs\Factory::createController( $context, $aimeos, $jobname )->run();
+			foreach ($jobs as $jobname) {
+				\Aimeos\Controller\Jobs\Factory::createController($context, $aimeos, $jobname)->run();
 			}
 		}
 	}
@@ -74,8 +74,8 @@ 
 	protected function getArguments()
 	{
 		return array(
-			array( 'jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"' ),
-			array( 'site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)' ),
+			array('jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"'),
+			array('site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)'),
 		);
 	}
 
@@ -98,19 +98,19 @@ 
 	protected function getContext()
 	{
 		$lv = $this->getLaravel();
-		$aimeos = $lv->make( '\Aimeos\Shop\Base\Aimeos' )->get();
-		$context = $lv->make( '\Aimeos\Shop\Base\Context' )->get( false, 'command' );
+		$aimeos = $lv->make('\Aimeos\Shop\Base\Aimeos')->get();
+		$context = $lv->make('\Aimeos\Shop\Base\Context')->get(false, 'command');
 
-		$tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' );
-		$view = $lv->make( '\Aimeos\Shop\Base\View' )->create( $context, $tmplPaths );
+		$tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates');
+		$view = $lv->make('\Aimeos\Shop\Base\View')->create($context, $tmplPaths);
 
-		$langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context )->getSubManager( 'language' );
-		$langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) );
-		$i18n = $lv->make( '\Aimeos\Shop\Base\I18n' )->get( $langids );
+		$langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context)->getSubManager('language');
+		$langids = array_keys($langManager->searchItems($langManager->createSearch(true)));
+		$i18n = $lv->make('\Aimeos\Shop\Base\I18n')->get($langids);
 
-		$context->setEditor( 'aimeos:jobs' );
-		$context->setView( $view );
-		$context->setI18n( $i18n );
+		$context->setEditor('aimeos:jobs');
+		$context->setView($view);
+		$context->setI18n($i18n);
 
 		return $context;
 	}

src/Aimeos/Shop/Command/SetupCommand.php

Spacing +31 added lines, -31 removed lines

@@ -43,39 +43,39 @@ 
 	 */
 	public function fire()
 	{
-		$ctx = $this->getLaravel()->make( '\Aimeos\Shop\Base\Context' )->get( false, 'command' );
-		$ctx->setEditor( 'aimeos:setup' );
+		$ctx = $this->getLaravel()->make('\Aimeos\Shop\Base\Context')->get(false, 'command');
+		$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 );
-		$manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx );
+		$taskPaths = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get()->getSetupPaths($template);
+		$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));
 
-		if( ( $task = $this->option( 'task' ) ) && is_array( $task ) ) {
-			$task = reset( $task );
+		if (($task = $this->option('task')) && is_array($task)) {
+			$task = reset($task);
 		}
 
-		switch( $this->option( 'action' ) )
+		switch ($this->option('action'))
 		{
 			case 'migrate':
-				$manager->migrate( $task );
+				$manager->migrate($task);
 				break;
 			case 'rollback':
-				$manager->rollback( $task );
+				$manager->rollback($task);
 				break;
 			case 'clean':
-				$manager->clean( $task );
+				$manager->clean($task);
 				break;
 			default:
-				throw new \Exception( sprintf( 'Invalid setup action "%1$s"', $this->option( 'action' ) ) );
+				throw new \Exception(sprintf('Invalid setup action "%1$s"', $this->option('action')));
 		}
 	}
 
@@ -88,8 +88,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'),
 		);
 	}
 
@@ -102,9 +102,9 @@ 
 	protected function getOptions()
 	{
 		return array(
-			array( 'option', null, InputOption::VALUE_REQUIRED, 'Setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array() ),
-			array( 'action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate' ),
-			array( 'task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null ),
+			array('option', null, InputOption::VALUE_REQUIRED, 'Setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array()),
+			array('action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate'),
+			array('task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null),
 		);
 	}
 
@@ -115,14 +115,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]);
 			}
 		}
 
@@ -137,12 +137,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( str_replace( '\\', '/', $name ), $value );
+			list($name, $value) = explode(':', $option);
+			$conf->set(str_replace('\\', '/', $name), $value);
 		}
 	}
 }

src/Aimeos/Shop/Command/CacheCommand.php

Spacing +11 added lines, -11 removed lines

@@ -42,24 +42,24 @@ 
 	 */
 	public function fire()
 	{
-		$context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false, 'command' );
-		$context->setEditor( 'aimeos:cache' );
+		$context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false, 'command');
+		$context->setEditor('aimeos:cache');
 
-		$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);
 
-			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext );
-			$lcontext->setCache( $cache );
+			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext);
+			$lcontext->setCache($cache);
 
-			$this->info( sprintf( 'Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode() ) );
+			$this->info(sprintf('Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode()));
 
-			\Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->clear();
+			\Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->clear();
 		}
 	}
 
@@ -72,7 +72,7 @@ 
 	protected function getArguments()
 	{
 		return array(
-			array( 'site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)' ),
+			array('site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)'),
 		);
 	}
 

src/Aimeos/Shop/Base/View.php

Spacing +54 added lines, -54 removed lines

@@ -41,7 +41,7 @@ 
 	 * @param \Aimeos\Shop\Base\I18n $i18n I18n object
 	 * @param \Aimeos\Shop\Base\Support $support Support object
 	 */
-	public function __construct( \Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support )
+	public function __construct(\Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support)
 	{
 		$this->i18n = $i18n;
 		$this->support = $support;
@@ -56,21 +56,21 @@ 
 	 * @param string|null $locale Code of the current language or null for no translation
 	 * @return \Aimeos\MW\View\Iface View object
 	 */
-	public function create( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null )
+	public function create(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null)
 	{
-		$engine = new \Aimeos\MW\View\Engine\Blade( app( 'Illuminate\Contracts\View\Factory' ) );
-		$view = new \Aimeos\MW\View\Standard( $templatePaths, array( '.blade.php' => $engine ) );
+		$engine = new \Aimeos\MW\View\Engine\Blade(app('Illuminate\Contracts\View\Factory'));
+		$view = new \Aimeos\MW\View\Standard($templatePaths, array('.blade.php' => $engine));
 		$config = $context->getConfig();
 
-		$this->addCsrf( $view );
-		$this->addAccess( $view, $context );
-		$this->addConfig( $view, $config );
-		$this->addNumber( $view, $config );
-		$this->addParam( $view );
-		$this->addRequest( $view );
-		$this->addResponse( $view );
-		$this->addTranslate( $view, $locale );
-		$this->addUrl( $view );
+		$this->addCsrf($view);
+		$this->addAccess($view, $context);
+		$this->addConfig($view, $config);
+		$this->addNumber($view, $config);
+		$this->addParam($view);
+		$this->addRequest($view);
+		$this->addResponse($view);
+		$this->addTranslate($view, $locale);
+		$this->addUrl($view);
 
 		return $view;
 	}
@@ -83,16 +83,16 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addAccess( \Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addAccess(\Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$support = $this->support;
 
-		$fcn = function() use ( $support, $context ) {
-			return $support->getGroups( $context );
+		$fcn = function() use ($support, $context) {
+			return $support->getGroups($context);
 		};
 
-		$helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn );
-		$view->addHelper( 'access', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Access\Standard($view, $fcn);
+		$view->addHelper('access', $helper);
 
 		return $view;
 	}
@@ -105,11 +105,11 @@ 
 	 * @param \Aimeos\MW\Config\Iface $config Configuration object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addConfig( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config )
+	protected function addConfig(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config)
 	{
-		$config = new \Aimeos\MW\Config\Decorator\Protect( clone $config, array( 'admin', 'client' ) );
-		$helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config );
-		$view->addHelper( 'config', $helper );
+		$config = new \Aimeos\MW\Config\Decorator\Protect(clone $config, array('admin', 'client'));
+		$helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config);
+		$view->addHelper('config', $helper);
 
 		return $view;
 	}
@@ -121,10 +121,10 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addCsrf( \Aimeos\MW\View\Iface $view )
+	protected function addCsrf(\Aimeos\MW\View\Iface $view)
 	{
-		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', csrf_token() );
-		$view->addHelper( 'csrf', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', csrf_token());
+		$view->addHelper('csrf', $helper);
 
 		return $view;
 	}
@@ -137,14 +137,14 @@ 
 	 * @param \Aimeos\MW\Config\Iface $config Configuration object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addNumber( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config )
+	protected function addNumber(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config)
 	{
-		$sepDec = $config->get( 'client/html/common/format/separatorDecimal', '.' );
-		$sep1000 = $config->get( 'client/html/common/format/separator1000', ' ' );
-		$decimals = $config->get( 'client/html/common/format/decimals', 2 );
+		$sepDec = $config->get('client/html/common/format/separatorDecimal', '.');
+		$sep1000 = $config->get('client/html/common/format/separator1000', ' ');
+		$decimals = $config->get('client/html/common/format/decimals', 2);
 
-		$helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000, $decimals );
-		$view->addHelper( 'number', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000, $decimals);
+		$view->addHelper('number', $helper);
 
 		return $view;
 	}
@@ -156,11 +156,11 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addParam( \Aimeos\MW\View\Iface $view )
+	protected function addParam(\Aimeos\MW\View\Iface $view)
 	{
-		$params = ( Route::current() ? Route::current()->parameters() + Input::all() : array() );
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params );
-		$view->addHelper( 'param', $helper );
+		$params = (Route::current() ? Route::current()->parameters() + Input::all() : array());
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params);
+		$view->addHelper('param', $helper);
 
 		return $view;
 	}
@@ -172,10 +172,10 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addRequest( \Aimeos\MW\View\Iface $view )
+	protected function addRequest(\Aimeos\MW\View\Iface $view)
 	{
-		$helper = new \Aimeos\MW\View\Helper\Request\Laravel5( $view, Request::instance() );
-		$view->addHelper( 'request', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Request\Laravel5($view, Request::instance());
+		$view->addHelper('request', $helper);
 
 		return $view;
 	}
@@ -187,10 +187,10 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addResponse( \Aimeos\MW\View\Iface $view )
+	protected function addResponse(\Aimeos\MW\View\Iface $view)
 	{
-		$helper = new \Aimeos\MW\View\Helper\Response\Laravel5( $view );
-		$view->addHelper( 'response', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Response\Laravel5($view);
+		$view->addHelper('response', $helper);
 
 		return $view;
 	}
@@ -203,20 +203,20 @@ 
 	 * @param string|null $locale ISO language code, e.g. "de" or "de_CH"
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addTranslate( \Aimeos\MW\View\Iface $view, $locale )
+	protected function addTranslate(\Aimeos\MW\View\Iface $view, $locale)
 	{
-		if( $locale !== null )
+		if ($locale !== null)
 		{
-			$i18n = $this->i18n->get( array( $locale ) );
+			$i18n = $this->i18n->get(array($locale));
 			$translation = $i18n[$locale];
 		}
 		else
 		{
-			$translation = new \Aimeos\MW\Translation\None( 'en' );
+			$translation = new \Aimeos\MW\Translation\None('en');
 		}
 
-		$helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation );
-		$view->addHelper( 'translate', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation);
+		$view->addHelper('translate', $helper);
 
 		return $view;
 	}
@@ -228,27 +228,27 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addUrl( \Aimeos\MW\View\Iface $view )
+	protected function addUrl(\Aimeos\MW\View\Iface $view)
 	{
 		$fixed = array();
 
-		if( Route::current() )
+		if (Route::current())
 		{
-			if( ( $value = Route::input( 'site' ) ) !== null ) {
+			if (($value = Route::input('site')) !== null) {
 				$fixed['site'] = $value;
 			}
 
-			if( ( $value = Route::input( 'locale' ) ) !== null ) {
+			if (($value = Route::input('locale')) !== null) {
 				$fixed['locale'] = $value;
 			}
 
-			if( ( $value = Route::input( 'currency' ) ) !== null ) {
+			if (($value = Route::input('currency')) !== null) {
 				$fixed['currency'] = $value;
 			}
 		}
 
-		$helper = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, app('url'), $fixed );
-		$view->addHelper( 'url', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Url\Laravel5($view, app('url'), $fixed);
+		$view->addHelper('url', $helper);
 
 		return $view;
 	}

src/Aimeos/Shop/Base/Locale.php

Spacing +19 added lines, -19 removed lines

@@ -38,7 +38,7 @@ 
 	 *
 	 * @param \Illuminate\Contracts\Config\Repository $config Configuration object
 	 */
-	public function __construct( \Illuminate\Contracts\Config\Repository $config )
+	public function __construct(\Illuminate\Contracts\Config\Repository $config)
 	{
 		$this->config = $config;
 	}
@@ -50,25 +50,25 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item object
 	 */
-	public function get( \Aimeos\MShop\Context\Item\Iface $context )
+	public function get(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		if( $this->locale === null )
+		if ($this->locale === null)
 		{
-			$site = Input::get( 'site', 'default' );
-			$currency = Input::get( 'currency', '' );
-			$lang = Input::get( 'locale', '' );
+			$site = Input::get('site', 'default');
+			$currency = Input::get('currency', '');
+			$lang = Input::get('locale', '');
 
-			if( Route::current() )
+			if (Route::current())
 			{
-				$site =  Route::input( 'site', $site );
-				$currency = Route::input( 'currency', $currency );
-				$lang = Route::input( 'locale', $lang );
+				$site = Route::input('site', $site);
+				$currency = Route::input('currency', $currency);
+				$lang = Route::input('locale', $lang);
 			}
 
-			$disableSites = $this->config->get( 'shop.disableSites', true );
+			$disableSites = $this->config->get('shop.disableSites', true);
 
-			$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;
@@ -82,17 +82,17 @@ 
 	 * @param string $site Unique site code
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item object
 	 */
-	public function getBackend( \Aimeos\MShop\Context\Item\Iface $context, $site )
+	public function getBackend(\Aimeos\MShop\Context\Item\Iface $context, $site)
 	{
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
 
 		try
 		{
-			$localeItem = $localeManager->bootstrap( $site, '', '', false );
-			$localeItem->setLanguageId( null );
-			$localeItem->setCurrencyId( null );
+			$localeItem = $localeManager->bootstrap($site, '', '', false);
+			$localeItem->setLanguageId(null);
+			$localeItem->setCurrencyId(null);
 		}
-		catch( \Aimeos\MShop\Locale\Exception $e )
+		catch (\Aimeos\MShop\Locale\Exception $e)
 		{
 			$localeItem = $localeManager->createItem();
 		}