aimeos / aimeos-laravel

src/Aimeos/Shop/Command/AccountCommand.php

Spacing +62 added lines, -62 removed lines

@@ -51,22 +51,22 @@ 
 	 */
 	public function handle()
 	{
-		if( ( $code = $this->argument( 'email' ) ) === null ) {
-			$code = $this->ask( 'E-Mail' );
+		if (($code = $this->argument('email')) === null) {
+			$code = $this->ask('E-Mail');
 		}
 
-		if( ( $password = $this->option( 'password' ) ) === null ) {
-			$password = $this->secret( 'Password' );
+		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::create( $context, 'locale' );
-		$localeItem = $localeManager->bootstrap( $this->argument( 'site' ), '', '', false );
-		$context->setLocale( $localeItem );
+		$localeManager = \Aimeos\MShop::create($context, 'locale');
+		$localeItem = $localeManager->bootstrap($this->argument('site'), '', '', false);
+		$context->setLocale($localeItem);
 
-		$this->addGroups( $context, $this->createCustomerItem( $context, $code, $password ) );
+		$this->addGroups($context, $this->createCustomerItem($context, $code, $password));
 	}
 
 
@@ -77,30 +77,30 @@ 
 	 * @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::create( $context, 'customer/lists' );
+		$manager = \Aimeos\MShop::create($context, 'customer/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'customer.lists.parentid', $userid ),
-			$search->compare( '==', 'customer.lists.refid', $groupid ),
-			$search->compare( '==', 'customer.lists.type', 'default' ),
-			$search->compare( '==', 'customer.lists.domain', 'customer/group' ),
+			$search->compare('==', 'customer.lists.parentid', $userid),
+			$search->compare('==', 'customer.lists.refid', $groupid),
+			$search->compare('==', 'customer.lists.type', 'default'),
+			$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);
 
-		if( count( $manager->searchItems( $search ) ) === 0 )
+		if (count($manager->searchItems($search)) === 0)
 		{
 			$item = $manager->createItem();
-			$item->setDomain( 'customer/group' );
-			$item->setParentId( $userid );
-			$item->setRefId( $groupid );
-			$item->setType( 'default' );
-			$item->setStatus( 1 );
+			$item->setDomain('customer/group');
+			$item->setParentId($userid);
+			$item->setRefId($groupid);
+			$item->setType('default');
+			$item->setStatus(1);
 
-			$manager->saveItem( $item, false );
+			$manager->saveItem($item, false);
 		}
 	}
 
@@ -111,22 +111,22 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Aimeos context object
 	 * @param \Aimeos\MShop\Customer\Item\Iface $user Aimeos customer object
 	 */
-	protected function addGroups( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user )
+	protected function addGroups(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user)
 	{
-		\Illuminate\Foundation\Auth\User::findOrFail( $user->getId() )
-			->forceFill( ['superuser' => ( $this->option( 'super' ) ? 1 : 0 )] )
+		\Illuminate\Foundation\Auth\User::findOrFail($user->getId())
+			->forceFill(['superuser' => ($this->option('super') ? 1 : 0)])
 			->save();
 
-		if( $this->option( 'admin' ) ) {
-			$this->addGroup( $context, $user, 'admin' );
+		if ($this->option('admin')) {
+			$this->addGroup($context, $user, 'admin');
 		}
 
-		if( $this->option( 'editor' ) ) {
-			$this->addGroup( $context, $user, 'editor' );
+		if ($this->option('editor')) {
+			$this->addGroup($context, $user, 'editor');
 		}
 
-		if( $this->option( 'api' ) ) {
-			$this->addGroup( $context, $user, 'api' );
+		if ($this->option('api')) {
+			$this->addGroup($context, $user, 'api');
 		}
 	}
 
@@ -138,13 +138,13 @@ 
 	 * @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)
 	{
 		$msg = 'Add "%1$s" group to user "%2$s" for site "%3$s"';
-		$this->info( sprintf( $msg, $group, $user->getCode(), $this->argument( 'site' ) ) );
+		$this->info(sprintf($msg, $group, $user->getCode(), $this->argument('site')));
 
-		$groupItem = $this->getGroupItem( $context, $group );
-		$this->addListItem( $context, $user->getId(), $groupItem->getId() );
+		$groupItem = $this->getGroupItem($context, $group);
+		$this->addListItem($context, $user->getId(), $groupItem->getId());
 	}
 
 
@@ -158,23 +158,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::create( $context, 'customer' );
+		$manager = \Aimeos\MShop::create($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;
 	}
@@ -188,8 +188,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 code to create the account for', 'default' ),
+			array('email', InputArgument::REQUIRED, 'E-mail address of the account that should be created'),
+			array('site', InputArgument::OPTIONAL, 'Site code to create the account for', 'default'),
 		);
 	}
 
@@ -201,21 +201,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::create( $context, 'customer/group' );
+		$manager = \Aimeos\MShop::create($context, 'customer/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;
@@ -230,11 +230,11 @@ 
 	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( 'viewer', null, InputOption::VALUE_NONE, 'If account should only have view 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'),
+			array('viewer', null, InputOption::VALUE_NONE, 'If account should only have view privileges'),
 		);
 	}
 }

src/routes.php

Spacing +49 added lines, -49 removed lines

@@ -2,7 +2,7 @@ 
 
 Route::group(config('shop.routes.admin', ['prefix' => 'admin', 'middleware' => ['web']]), function() {
 
-	Route::match( array( 'GET' ), '', array(
+	Route::match(array('GET'), '', array(
 		'as' => 'aimeos_shop_admin',
 		'uses' => 'Aimeos\Shop\Controller\AdminController@indexAction'
 	));
@@ -12,112 +12,112 @@ 
 
 Route::group(config('shop.routes.jqadm', ['prefix' => 'admin/{site}/jqadm', 'middleware' => ['web', 'auth']]), function() {
 
-	Route::match( array( 'GET' ), 'file/{type}', array(
+	Route::match(array('GET'), 'file/{type}', array(
 		'as' => 'aimeos_shop_jqadm_file',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@fileAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'copy/{resource}/{id}', array(
+	Route::match(array('GET', 'POST'), 'copy/{resource}/{id}', array(
 		'as' => 'aimeos_shop_jqadm_copy',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@copyAction'
-	))->where( array( 'resource' => '[a-z\/]+' ) );
+	))->where(array('resource' => '[a-z\/]+'));
 
-	Route::match( array( 'GET', 'POST' ), 'create/{resource}', array(
+	Route::match(array('GET', 'POST'), 'create/{resource}', array(
 		'as' => 'aimeos_shop_jqadm_create',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@createAction'
-	))->where( array( 'resource' => '[a-z\/]+' ) );
+	))->where(array('resource' => '[a-z\/]+'));
 
-	Route::match( array( 'GET', 'POST' ), 'delete/{resource}/{id}', array(
+	Route::match(array('GET', 'POST'), 'delete/{resource}/{id}', array(
 		'as' => 'aimeos_shop_jqadm_delete',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@deleteAction'
-	))->where( array( 'resource' => '[a-z\/]+' ) );
+	))->where(array('resource' => '[a-z\/]+'));
 
-	Route::match( array( 'GET', 'POST' ), 'export/{resource}', array(
+	Route::match(array('GET', 'POST'), 'export/{resource}', array(
 		'as' => 'aimeos_shop_jqadm_export',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@exportAction'
-	))->where( array( 'resource' => '[a-z\/]+' ) );
+	))->where(array('resource' => '[a-z\/]+'));
 
-	Route::match( array( 'GET' ), 'get/{resource}/{id}', array(
+	Route::match(array('GET'), 'get/{resource}/{id}', array(
 		'as' => 'aimeos_shop_jqadm_get',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@getAction'
-	))->where( array( 'resource' => '[a-z\/]+' ) );
+	))->where(array('resource' => '[a-z\/]+'));
 
-	Route::match( array( 'POST' ), 'save/{resource}', array(
+	Route::match(array('POST'), 'save/{resource}', array(
 		'as' => 'aimeos_shop_jqadm_save',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@saveAction'
-	))->where( array( 'resource' => '[a-z\/]+' ) );
+	))->where(array('resource' => '[a-z\/]+'));
 
-	Route::match( array( 'GET', 'POST' ), 'search/{resource}', array(
+	Route::match(array('GET', 'POST'), 'search/{resource}', array(
 		'as' => 'aimeos_shop_jqadm_search',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@searchAction'
-	))->where( array( 'resource' => '[a-z\/]+' ) );
+	))->where(array('resource' => '[a-z\/]+'));
 
 });
 
 
 Route::group(config('shop.routes.jsonadm', ['prefix' => 'admin/{site}/jsonadm', 'middleware' => ['web', 'auth']]), function() {
 
-	Route::match( array( 'DELETE' ), '{resource}/{id?}', array(
+	Route::match(array('DELETE'), '{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_delete',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@deleteAction'
-	))->where( array( 'resource' => '[a-z\/]+' ) );
+	))->where(array('resource' => '[a-z\/]+'));
 
-	Route::match( array( 'GET' ), '{resource}/{id?}', array(
+	Route::match(array('GET'), '{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_get',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@getAction'
-	))->where( array( 'resource' => '[a-z\/]+' ) );
+	))->where(array('resource' => '[a-z\/]+'));
 
-	Route::match( array( 'PATCH' ), '{resource}/{id?}', array(
+	Route::match(array('PATCH'), '{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_patch',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@patchAction'
-	))->where( array( 'resource' => '[a-z\/]+' ) );
+	))->where(array('resource' => '[a-z\/]+'));
 
-	Route::match( array( 'POST' ), '{resource}/{id?}', array(
+	Route::match(array('POST'), '{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_post',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@postAction'
-	))->where( array( 'resource' => '[a-z\/]+' ) );
+	))->where(array('resource' => '[a-z\/]+'));
 
-	Route::match( array( 'PUT' ), '{resource}/{id?}', array(
+	Route::match(array('PUT'), '{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_put',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@putAction'
-	))->where( array( 'resource' => '[a-z\/]+' ) );
+	))->where(array('resource' => '[a-z\/]+'));
 
-	Route::match( array( 'OPTIONS' ), '{resource?}', array(
+	Route::match(array('OPTIONS'), '{resource?}', array(
 		'as' => 'aimeos_shop_jsonadm_options',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@optionsAction'
-	))->where( array( 'resource' => '[a-z\/]*' ) );
+	))->where(array('resource' => '[a-z\/]*'));
 
 });
 
 
 Route::group(config('shop.routes.jsonapi', ['prefix' => 'jsonapi', 'middleware' => ['web', 'api']]), function() {
 
-	Route::match( array( 'DELETE' ), '{resource}', array(
+	Route::match(array('DELETE'), '{resource}', array(
 		'as' => 'aimeos_shop_jsonapi_delete',
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@deleteAction'
 	));
 
-	Route::match( array( 'GET' ), '{resource}', array(
+	Route::match(array('GET'), '{resource}', array(
 		'as' => 'aimeos_shop_jsonapi_get',
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@getAction'
 	));
 
-	Route::match( array( 'PATCH' ), '{resource}', array(
+	Route::match(array('PATCH'), '{resource}', array(
 		'as' => 'aimeos_shop_jsonapi_patch',
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@patchAction'
 	));
 
-	Route::match( array( 'POST' ), '{resource}', array(
+	Route::match(array('POST'), '{resource}', array(
 		'as' => 'aimeos_shop_jsonapi_post',
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@postAction'
 	));
 
-	Route::match( array( 'PUT' ), '{resource}', array(
+	Route::match(array('PUT'), '{resource}', array(
 		'as' => 'aimeos_shop_jsonapi_put',
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@putAction'
 	));
 
-	Route::match( array( 'OPTIONS' ), '{resource?}', array(
+	Route::match(array('OPTIONS'), '{resource?}', array(
 		'as' => 'aimeos_shop_jsonapi_options',
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@optionsAction'
 	));
@@ -127,22 +127,22 @@ 
 
 Route::group(config('shop.routes.account', ['middleware' => ['web', 'auth']]), function() {
 
-	Route::match( array( 'GET', 'POST' ), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
+	Route::match(array('GET', 'POST'), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
 		'as' => 'aimeos_shop_account_favorite',
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
+	Route::match(array('GET', 'POST'), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
 		'as' => 'aimeos_shop_account_watch',
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'myaccount/download/{dl_id}', array(
+	Route::match(array('GET', 'POST'), 'myaccount/download/{dl_id}', array(
 		'as' => 'aimeos_shop_account_download',
 		'uses' => 'Aimeos\Shop\Controller\AccountController@downloadAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'myaccount', array(
+	Route::match(array('GET', 'POST'), 'myaccount', array(
 		'as' => 'aimeos_shop_account',
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
 	));
@@ -152,52 +152,52 @@ 
 
 Route::group(config('shop.routes.default', ['middleware' => ['web']]), function() {
 
-	Route::match( array( 'GET', 'POST' ), 'count', array(
+	Route::match(array('GET', 'POST'), 'count', array(
 		'as' => 'aimeos_shop_count',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@countAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'd/{d_name}/{d_prodid}/{d_pos?}', array(
+	Route::match(array('GET', 'POST'), 'd/{d_name}/{d_prodid}/{d_pos?}', array(
 		'as' => 'aimeos_shop_detail',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'd/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
+	Route::match(array('GET', 'POST'), 'd/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
 		'as' => 'aimeos_shop_session_pinned',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'list', array(
+	Route::match(array('GET', 'POST'), 'list', array(
 		'as' => 'aimeos_shop_list',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@listAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'c/{f_name}/{f_catid}', array(
+	Route::match(array('GET', 'POST'), 'c/{f_name}/{f_catid}', array(
 		'as' => 'aimeos_shop_tree',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@treeAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'suggest', array(
+	Route::match(array('GET', 'POST'), 'suggest', array(
 		'as' => 'aimeos_shop_suggest',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@suggestAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'stock', array(
+	Route::match(array('GET', 'POST'), 'stock', array(
 		'as' => 'aimeos_shop_stock',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@stockAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'basket', array(
+	Route::match(array('GET', 'POST'), 'basket', array(
 		'as' => 'aimeos_shop_basket',
 		'uses' => 'Aimeos\Shop\Controller\BasketController@indexAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'checkout/{c_step?}', array(
+	Route::match(array('GET', 'POST'), 'checkout/{c_step?}', array(
 		'as' => 'aimeos_shop_checkout',
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@indexAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'confirm/{code?}', array(
+	Route::match(array('GET', 'POST'), 'confirm/{code?}', array(
 		'as' => 'aimeos_shop_confirm',
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction'
 	));
@@ -207,7 +207,7 @@ 
 
 Route::group(config('shop.routes.update', []), function() {
 
-	Route::match( array( 'GET', 'POST' ), 'update', array(
+	Route::match(array('GET', 'POST'), 'update', array(
 		'as' => 'aimeos_shop_update',
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@updateAction'
 	));

src/Aimeos/Shop/ShopServiceProvider.php

Spacing +8 added lines, -8 removed lines

@@ -37,13 +37,13 @@ 
 	public function boot()
 	{
 		$ds = DIRECTORY_SEPARATOR;
-		$basedir = dirname( dirname( __DIR__ ) ) . $ds;
+		$basedir = dirname(dirname(__DIR__)).$ds;
 
-		$this->loadRoutesFrom( $basedir . 'routes.php' );
-		$this->loadViewsFrom( $basedir . 'views', 'shop' );
+		$this->loadRoutesFrom($basedir.'routes.php');
+		$this->loadViewsFrom($basedir.'views', 'shop');
 
-		$this->publishes( [ $basedir . 'config/shop.php' => config_path( 'shop.php' ) ], 'config' );
-		$this->publishes( [ dirname( $basedir ) . $ds . 'public' => public_path( 'packages/aimeos/shop' ) ], 'public' );
+		$this->publishes([$basedir.'config/shop.php' => config_path('shop.php')], 'config');
+		$this->publishes([dirname($basedir).$ds.'public' => public_path('packages/aimeos/shop')], 'public');
 	}
 
 
@@ -54,7 +54,7 @@ 
 	 */
 	public function register()
 	{
-		$this->mergeConfigFrom( dirname( dirname( __DIR__ ) ) . DIRECTORY_SEPARATOR . 'default.php', 'shop');
+		$this->mergeConfigFrom(dirname(dirname(__DIR__)).DIRECTORY_SEPARATOR.'default.php', 'shop');
 
 		$this->app->singleton('aimeos', function($app) {
 			return new \Aimeos\Shop\Base\Aimeos($app['config']);
@@ -89,12 +89,12 @@ 
 		});
 
 
-		$this->commands( array(
+		$this->commands(array(
 			'Aimeos\Shop\Command\AccountCommand',
 			'Aimeos\Shop\Command\CacheCommand',
 			'Aimeos\Shop\Command\SetupCommand',
 			'Aimeos\Shop\Command\JobsCommand',
-		) );
+		));
 	}
 
 

src/Aimeos/Shop/Command/JobsCommand.php

Spacing +23 added lines, -23 removed lines

@@ -46,30 +46,30 @@ 
 	 */
 	public function handle()
 	{
-		$aimeos = $this->getLaravel()->make( 'aimeos' )->get();
+		$aimeos = $this->getLaravel()->make('aimeos')->get();
 		$context = $this->getContext();
 
 		$process = $context->getProcess();
-		$jobs = explode( ' ', $this->argument( 'jobs' ) );
-		$localeManager = \Aimeos\MShop::create( $context, 'locale' );
+		$jobs = explode(' ', $this->argument('jobs'));
+		$localeManager = \Aimeos\MShop::create($context, 'locale');
 
-		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 )
+			foreach ($jobs as $jobname)
 			{
-				$fcn = function( $context, $aimeos, $jobname ) {
-					\Aimeos\Controller\Jobs::create( $context, $aimeos, $jobname )->run();
+				$fcn = function($context, $aimeos, $jobname) {
+					\Aimeos\Controller\Jobs::create($context, $aimeos, $jobname)->run();
 				};
 
-				$process->start( $fcn, [$context, $aimeos, $jobname], true );
+				$process->start($fcn, [$context, $aimeos, $jobname], true);
 			}
 		}
 
@@ -85,19 +85,19 @@ 
 	protected function getContext()
 	{
 		$lv = $this->getLaravel();
-		$aimeos = $lv->make( 'aimeos' )->get();
-		$context = $lv->make( 'aimeos.context' )->get( false, 'command' );
+		$aimeos = $lv->make('aimeos')->get();
+		$context = $lv->make('aimeos.context')->get(false, 'command');
 
-		$tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' );
-		$view = $lv->make( 'aimeos.view' )->create( $context, $tmplPaths );
+		$tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates');
+		$view = $lv->make('aimeos.view')->create($context, $tmplPaths);
 
-		$langManager = \Aimeos\MShop::create( $context, 'locale/language' );
-		$langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) );
-		$i18n = $lv->make( 'aimeos.i18n' )->get( $langids );
+		$langManager = \Aimeos\MShop::create($context, 'locale/language');
+		$langids = array_keys($langManager->searchItems($langManager->createSearch(true)));
+		$i18n = $lv->make('aimeos.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/Base/Shop.php

Spacing +9 added lines, -9 removed lines

@@ -41,16 +41,16 @@ 
 	 * @param \Aimeos\Shop\Base\Context $context Context object
 	 * @param \Aimeos\Shop\Base\View $view View object
 	 */
-	public function __construct(  \Aimeos\Shop\Base\Aimeos $aimeos,
-		\Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\View $view )
+	public function __construct(\Aimeos\Shop\Base\Aimeos $aimeos,
+		\Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\View $view)
 	{
 		$this->context = $context->get();
 
 		$langid = $this->context->getLocale()->getLanguageId();
-		$tmplPaths = $aimeos->get()->getCustomPaths( 'client/html/templates' );
+		$tmplPaths = $aimeos->get()->getCustomPaths('client/html/templates');
 
-		$this->view = $view->create( $this->context, $tmplPaths, $langid );
-		$this->context->setView( $this->view );
+		$this->view = $view->create($this->context, $tmplPaths, $langid);
+		$this->context->setView($this->view);
 	}
 
 
@@ -60,12 +60,12 @@ 
 	 * @param string $name Name of the shop component
 	 * @return \Aimeos\Client\Html\Iface HTML client
 	 */
-	public function get( $name )
+	public function get($name)
 	{
-		if( !isset( $this->objects[$name] ) )
+		if (!isset($this->objects[$name]))
 		{
-			$client = \Aimeos\Client\Html::create( $this->context, $name );
-			$client->setView( clone $this->view );
+			$client = \Aimeos\Client\Html::create($this->context, $name);
+			$client->setView(clone $this->view);
 			$client->process();
 
 			$this->objects[$name] = $client;

src/Aimeos/Shop/Controller/CatalogController.php

Spacing +21 added lines, -21 removed lines

@@ -30,10 +30,10 @@ 
 	 */
 	public function countAction()
 	{
-		foreach( app( 'config' )->get( 'shop.page.catalog-count', ['catalog/count'] ) as $name )
+		foreach (app('config')->get('shop.page.catalog-count', ['catalog/count']) as $name)
 		{
-			$params['aiheader'][$name] = Shop::get( $name )->getHeader();
-			$params['aibody'][$name] = Shop::get( $name )->getBody();
+			$params['aiheader'][$name] = Shop::get($name)->getHeader();
+			$params['aibody'][$name] = Shop::get($name)->getBody();
 		}
 
 		return Response::view('shop::catalog.count', $params)
@@ -48,12 +48,12 @@ 
 	 */
 	public function detailAction()
 	{
-		$default = ['basket/mini','catalog/stage','catalog/detail','catalog/session'];
+		$default = ['basket/mini', 'catalog/stage', 'catalog/detail', 'catalog/session'];
 
-		foreach( app( 'config' )->get( 'shop.page.catalog-detail', $default ) as $name )
+		foreach (app('config')->get('shop.page.catalog-detail', $default) as $name)
 		{
-			$params['aiheader'][$name] = Shop::get( $name )->getHeader();
-			$params['aibody'][$name] = Shop::get( $name )->getBody();
+			$params['aiheader'][$name] = Shop::get($name)->getHeader();
+			$params['aibody'][$name] = Shop::get($name)->getBody();
 		}
 
 		return Response::view('shop::catalog.detail', $params);
@@ -67,12 +67,12 @@ 
 	 */
 	public function listAction()
 	{
-		$default = ['basket/mini','catalog/filter','catalog/lists'];
+		$default = ['basket/mini', 'catalog/filter', 'catalog/lists'];
 
-		foreach( app( 'config' )->get( 'shop.page.catalog-list', $default ) as $name )
+		foreach (app('config')->get('shop.page.catalog-list', $default) as $name)
 		{
-			$params['aiheader'][$name] = Shop::get( $name )->getHeader();
-			$params['aibody'][$name] = Shop::get( $name )->getBody();
+			$params['aiheader'][$name] = Shop::get($name)->getHeader();
+			$params['aibody'][$name] = Shop::get($name)->getBody();
 		}
 
 		return Response::view('shop::catalog.list', $params);
@@ -86,10 +86,10 @@ 
 	 */
 	public function stockAction()
 	{
-		foreach( app( 'config' )->get( 'shop.page.catalog-stock', ['catalog/stock'] ) as $name )
+		foreach (app('config')->get('shop.page.catalog-stock', ['catalog/stock']) as $name)
 		{
-			$params['aiheader'][$name] = Shop::get( $name )->getHeader();
-			$params['aibody'][$name] = Shop::get( $name )->getBody();
+			$params['aiheader'][$name] = Shop::get($name)->getHeader();
+			$params['aibody'][$name] = Shop::get($name)->getBody();
 		}
 
 		return Response::view('shop::catalog.stock', $params)
@@ -104,10 +104,10 @@ 
 	 */
 	public function suggestAction()
 	{
-		foreach( app( 'config' )->get( 'shop.page.catalog-suggest', ['catalog/suggest'] ) as $name )
+		foreach (app('config')->get('shop.page.catalog-suggest', ['catalog/suggest']) as $name)
 		{
-			$params['aiheader'][$name] = Shop::get( $name )->getHeader();
-			$params['aibody'][$name] = Shop::get( $name )->getBody();
+			$params['aiheader'][$name] = Shop::get($name)->getHeader();
+			$params['aibody'][$name] = Shop::get($name)->getBody();
 		}
 
 		return Response::view('shop::catalog.suggest', $params)
@@ -122,12 +122,12 @@ 
 	 */
 	public function treeAction()
 	{
-		$default = ['basket/mini','catalog/filter','catalog/stage','catalog/lists'];
+		$default = ['basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists'];
 
-		foreach( app( 'config' )->get( 'shop.page.catalog-tree', $default ) as $name )
+		foreach (app('config')->get('shop.page.catalog-tree', $default) as $name)
 		{
-			$params['aiheader'][$name] = Shop::get( $name )->getHeader();
-			$params['aibody'][$name] = Shop::get( $name )->getBody();
+			$params['aiheader'][$name] = Shop::get($name)->getHeader();
+			$params['aibody'][$name] = Shop::get($name)->getBody();
 		}
 
 		return Response::view('shop::catalog.tree', $params);

src/Aimeos/Shop/Controller/AdminController.php

Spacing +11 added lines, -11 removed lines

@@ -36,26 +36,26 @@
 	 * @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( Auth::check() === false
-			|| $request->user()->can( 'admin', [AdminController::class, ['admin', 'editor']] ) === false
+		if (Auth::check() === false
+			|| $request->user()->can('admin', [AdminController::class, ['admin', 'editor']]) === false
 		) {
-			return redirect()->guest( 'login' );
+			return redirect()->guest('login');
 		}
 
 		$siteId = $request->user()->siteid;
-		$context = app( 'aimeos.context' )->get( false );
-		$siteManager = \Aimeos\MShop::create( $context, 'locale/site' );
-		$siteCode = ( $siteId ? $siteManager->getItem( $siteId )->getCode() : 'default' );
-		$locale = $request->user()->langid ?: config( 'app.locale', 'en' );
+		$context = app('aimeos.context')->get(false);
+		$siteManager = \Aimeos\MShop::create($context, 'locale/site');
+		$siteCode = ($siteId ? $siteManager->getItem($siteId)->getCode() : 'default');
+		$locale = $request->user()->langid ?: config('app.locale', 'en');
 
 		$param = array(
 			'resource' => 'dashboard',
-			'site' => Route::input( 'site', Input::get( 'site', $siteCode ) ),
-			'lang' => Route::input( 'lang', Input::get( 'lang', $locale ) )
+			'site' => Route::input('site', Input::get('site', $siteCode)),
+			'lang' => Route::input('lang', Input::get('lang', $locale))
 		);
 
-		return redirect()->route( 'aimeos_shop_jqadm_search', $param );
+		return redirect()->route('aimeos_shop_jqadm_search', $param);
 	}
 }

src/Aimeos/Shop/Controller/CheckoutController.php

Spacing +9 added lines, -9 removed lines

@@ -30,10 +30,10 @@ 
 	 */
 	public function confirmAction()
 	{
-		foreach( app( 'config' )->get( 'shop.page.checkout-confirm', ['checkout/confirm'] ) as $name )
+		foreach (app('config')->get('shop.page.checkout-confirm', ['checkout/confirm']) as $name)
 		{
-			$params['aiheader'][$name] = Shop::get( $name )->getHeader();
-			$params['aibody'][$name] = Shop::get( $name )->getBody();
+			$params['aiheader'][$name] = Shop::get($name)->getHeader();
+			$params['aibody'][$name] = Shop::get($name)->getBody();
 		}
 
 		return Response::view('shop::checkout.confirm', $params)->header('Cache-Control', 'no-store');
@@ -47,10 +47,10 @@ 
 	 */
 	public function indexAction()
 	{
-		foreach( app( 'config' )->get( 'shop.page.checkout-index', ['checkout/standard'] ) as $name )
+		foreach (app('config')->get('shop.page.checkout-index', ['checkout/standard']) as $name)
 		{
-			$params['aiheader'][$name] = Shop::get( $name )->getHeader();
-			$params['aibody'][$name] = Shop::get( $name )->getBody();
+			$params['aiheader'][$name] = Shop::get($name)->getHeader();
+			$params['aibody'][$name] = Shop::get($name)->getBody();
 		}
 
 		return Response::view('shop::checkout.index', $params)->header('Cache-Control', 'no-store');
@@ -64,10 +64,10 @@ 
 	 */
 	public function updateAction()
 	{
-		foreach( app( 'config' )->get( 'shop.page.checkout-update', ['checkout/update'] ) as $name )
+		foreach (app('config')->get('shop.page.checkout-update', ['checkout/update']) as $name)
 		{
-			$params['aiheader'][$name] = Shop::get( $name )->getHeader();
-			$params['aibody'][$name] = Shop::get( $name )->getBody();
+			$params['aiheader'][$name] = Shop::get($name)->getHeader();
+			$params['aibody'][$name] = Shop::get($name)->getBody();
 		}
 
 		return Response::view('shop::checkout.update', $params)->header('Cache-Control', 'no-store');

src/Aimeos/Shop/Controller/JsonadmController.php

Spacing +34 added lines, -34 removed lines

@@ -36,13 +36,13 @@ 
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function deleteAction( ServerRequestInterface $request )
+	public function deleteAction(ServerRequestInterface $request)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api']]);
 		}
 
-		return $this->createAdmin()->delete( $request, new Response() );
+		return $this->createAdmin()->delete($request, new Response());
 	}
 
 
@@ -52,13 +52,13 @@ 
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function getAction( ServerRequestInterface $request )
+	public function getAction(ServerRequestInterface $request)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor']]);
 		}
 
-		return $this->createAdmin()->get( $request, new Response() );
+		return $this->createAdmin()->get($request, new Response());
 	}
 
 
@@ -68,13 +68,13 @@ 
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function patchAction( ServerRequestInterface $request )
+	public function patchAction(ServerRequestInterface $request)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api']]);
 		}
 
-		return $this->createAdmin()->patch( $request, new Response() );
+		return $this->createAdmin()->patch($request, new Response());
 	}
 
 
@@ -84,13 +84,13 @@ 
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function postAction( ServerRequestInterface $request )
+	public function postAction(ServerRequestInterface $request)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api']]);
 		}
 
-		return $this->createAdmin()->post( $request, new Response() );
+		return $this->createAdmin()->post($request, new Response());
 	}
 
 
@@ -100,13 +100,13 @@ 
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function putAction( ServerRequestInterface $request )
+	public function putAction(ServerRequestInterface $request)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api']]);
 		}
 
-		return $this->createAdmin()->put( $request, new Response() );
+		return $this->createAdmin()->put($request, new Response());
 	}
 
 
@@ -116,13 +116,13 @@ 
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function optionsAction( ServerRequestInterface $request )
+	public function optionsAction(ServerRequestInterface $request)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor']]);
 		}
 
-		return $this->createAdmin()->options( $request, new Response() );
+		return $this->createAdmin()->options($request, new Response());
 	}
 
 
@@ -133,18 +133,18 @@ 
 	 */
 	protected function createAdmin()
 	{
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
-		$lang = Input::get( 'locale', config( 'app.locale', 'en' ) );
-		$resource = Route::input( 'resource' );
+		$site = Route::input('site', Input::get('site', 'default'));
+		$lang = Input::get('locale', config('app.locale', 'en'));
+		$resource = Route::input('resource');
 
-		$aimeos = app( 'aimeos' )->get();
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' );
+		$aimeos = app('aimeos')->get();
+		$templatePaths = $aimeos->getCustomPaths('admin/jsonadm/templates');
 
-		$context = app( 'aimeos.context' )->get( false, 'backend' );
-		$context->setI18n( app('aimeos.i18n')->get( array( $lang, 'en' ) ) );
-		$context->setLocale( app('aimeos.locale')->getBackend( $context, $site ) );
-		$context->setView( app( 'aimeos.view' )->create( $context, $templatePaths, $lang ) );
+		$context = app('aimeos.context')->get(false, 'backend');
+		$context->setI18n(app('aimeos.i18n')->get(array($lang, 'en')));
+		$context->setLocale(app('aimeos.locale')->getBackend($context, $site));
+		$context->setView(app('aimeos.view')->create($context, $templatePaths, $lang));
 
-		return \Aimeos\Admin\JsonAdm::create( $context, $aimeos, $resource );
+		return \Aimeos\Admin\JsonAdm::create($context, $aimeos, $resource);
 	}
 }