aimeos / aimeos-laravel

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/routes.php

Spacing +43 added lines, -43 removed lines

@@ -2,7 +2,7 @@ 
 
 Route::group(config('shop.routes.login', ['middleware' => ['web']]), function() {
 
-	Route::match( array( 'GET' ), 'admin', array(
+	Route::match(array('GET'), 'admin', array(
 		'as' => 'aimeos_shop_admin',
 		'uses' => 'Aimeos\Shop\Controller\AdminController@indexAction'
 	));
@@ -12,109 +12,109 @@ 
 
 Route::group(config('shop.routes.admin', ['middleware' => ['web', 'auth']]), function() {
 
-	Route::match( array( 'GET' ), 'extadm', array(
+	Route::match(array('GET'), 'extadm', array(
 		'as' => 'aimeos_shop_extadm',
 		'uses' => 'Aimeos\Shop\Controller\ExtadmController@indexAction'
 	));
 
-	Route::match( array( 'GET' ), 'extadm/file', array(
+	Route::match(array('GET'), 'extadm/file', array(
 		'as' => 'aimeos_shop_extadm_file',
 		'uses' => 'Aimeos\Shop\Controller\ExtadmController@fileAction'
 	));
 
-	Route::match( array( 'POST' ), 'extadm/do', array(
+	Route::match(array('POST'), 'extadm/do', array(
 		'as' => 'aimeos_shop_extadm_json',
 		'uses' => 'Aimeos\Shop\Controller\ExtadmController@doAction'
 	));
 
 
-	Route::match( array( 'GET' ), 'jqadm/file/{type}', array(
+	Route::match(array('GET'), 'jqadm/file/{type}', array(
 		'as' => 'aimeos_shop_jqadm_file',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@fileAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'jqadm/copy/{resource}/{id}', array(
+	Route::match(array('GET', 'POST'), 'jqadm/copy/{resource}/{id}', array(
 		'as' => 'aimeos_shop_jqadm_copy',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@copyAction'
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]+' ) );
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]+'));
 
-	Route::match( array( 'GET', 'POST' ), 'jqadm/create/{resource}', array(
+	Route::match(array('GET', 'POST'), 'jqadm/create/{resource}', array(
 		'as' => 'aimeos_shop_jqadm_create',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@createAction'
-	))->where( array( 'resource' => '[^0-9]+' ) );
+	))->where(array('resource' => '[^0-9]+'));
 
-	Route::match( array( 'GET', 'POST' ), 'jqadm/delete/{resource}/{id}', array(
+	Route::match(array('GET', 'POST'), 'jqadm/delete/{resource}/{id}', array(
 		'as' => 'aimeos_shop_jqadm_delete',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@deleteAction'
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]+' ) );
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]+'));
 
-	Route::match( array( 'GET' ), 'jqadm/get/{resource}/{id}', array(
+	Route::match(array('GET'), 'jqadm/get/{resource}/{id}', array(
 		'as' => 'aimeos_shop_jqadm_get',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@getAction'
-	))->where( array( 'resource' => '[^0-9]*', 'id' => '[0-9]+' ) );
+	))->where(array('resource' => '[^0-9]*', 'id' => '[0-9]+'));
 
-	Route::match( array( 'POST' ), 'jqadm/save/{resource}/{id?}', array(
+	Route::match(array('POST'), 'jqadm/save/{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jqadm_save',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@saveAction'
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
 
-	Route::match( array( 'GET', 'POST' ), 'jqadm/search/{resource}', array(
+	Route::match(array('GET', 'POST'), 'jqadm/search/{resource}', array(
 		'as' => 'aimeos_shop_jqadm_search',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@searchAction'
-	))->where( array( 'resource' => '[^0-9]+' ) );
+	))->where(array('resource' => '[^0-9]+'));
 
 
-	Route::match( array( 'DELETE' ), 'jsonadm/{resource}/{id?}', array(
+	Route::match(array('DELETE'), 'jsonadm/{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_delete',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@deleteAction'
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
 
-	Route::match( array( 'GET' ), 'jsonadm/{resource}/{id?}', array(
+	Route::match(array('GET'), 'jsonadm/{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_get',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@getAction'
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
 
-	Route::match( array( 'PATCH' ), 'jsonadm/{resource}/{id?}', array(
+	Route::match(array('PATCH'), 'jsonadm/{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_patch',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@patchAction'
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
 
-	Route::match( array( 'POST' ), 'jsonadm/{resource}/{id?}', array(
+	Route::match(array('POST'), 'jsonadm/{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_post',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@postAction'
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
 
-	Route::match( array( 'PUT' ), 'jsonadm/{resource}/{id?}', array(
+	Route::match(array('PUT'), 'jsonadm/{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_put',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@putAction'
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
 
-	Route::match( array( 'OPTIONS' ), 'jsonadm/{resource?}', array(
+	Route::match(array('OPTIONS'), 'jsonadm/{resource?}', array(
 		'as' => 'aimeos_shop_jsonadm_options',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@optionsAction'
-	))->where( array( 'resource' => '[^0-9]*' ) );
+	))->where(array('resource' => '[^0-9]*'));
 
 });
 
 
 Route::group(config('shop.routes.account', ['middleware' => ['web', 'auth']]), function() {
 
-	Route::match( array( 'GET', 'POST' ), 'myaccount', array(
+	Route::match(array('GET', 'POST'), 'myaccount', array(
 		'as' => 'aimeos_shop_account',
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
 	));
 
-	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'
 	));
@@ -124,42 +124,42 @@ 
 
 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' ), 'detail/{d_prodid}/{d_name?}/{d_pos?}', array(
+	Route::match(array('GET', 'POST'), 'detail/{d_prodid}/{d_name?}/{d_pos?}', array(
 		'as' => 'aimeos_shop_detail',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
+	Route::match(array('GET', 'POST'), 'detail/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' ), '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'
 	));
@@ -169,7 +169,7 @@ 
 
 Route::group(config('shop.routes.confirm', ['middleware' => ['web']]), function() {
 
-	Route::match( array( 'GET', 'POST' ), 'confirm', array(
+	Route::match(array('GET', 'POST'), 'confirm', array(
 		'as' => 'aimeos_shop_confirm',
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction'
 	));
@@ -179,7 +179,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/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();
 		}

src/Aimeos/Shop/Base/Config.php

Spacing +9 added lines, -9 removed lines

@@ -40,7 +40,7 @@ 
 	 * @param \Illuminate\Contracts\Config\Repository $config Configuration object
 	 * @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object
 	 */
-	public function __construct( \Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos )
+	public function __construct(\Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos)
 	{
 		$this->aimeos = $aimeos;
 		$this->config = $config;
@@ -53,21 +53,21 @@ 
 	 * @param integer $type Configuration type ("frontend" or "backend")
 	 * @return \Aimeos\MW\Config\Iface Configuration object
 	 */
-	public function get( $type = 'frontend' )
+	public function get($type = 'frontend')
 	{
-		if( !isset( $this->objects[$type] ) )
+		if (!isset($this->objects[$type]))
 		{
 			$configPaths = $this->aimeos->get()->getConfigPaths();
-			$config = new \Aimeos\MW\Config\PHPArray( array(), $configPaths );
+			$config = new \Aimeos\MW\Config\PHPArray(array(), $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:'));
 			}
 
-			$config = new \Aimeos\MW\Config\Decorator\Memory( $config, $this->config->get( 'shop' ) );
+			$config = new \Aimeos\MW\Config\Decorator\Memory($config, $this->config->get('shop'));
 
-			if( ( $conf = $this->config->get( 'shop.' . $type, array() ) ) !== array() ) {
-				$config = new \Aimeos\MW\Config\Decorator\Memory( $config, $conf );
+			if (($conf = $this->config->get('shop.'.$type, array())) !== array()) {
+				$config = new \Aimeos\MW\Config\Decorator\Memory($config, $conf);
 			}
 
 			$this->objects[$type] = $config;

src/helpers.php

Spacing +11 added lines, -11 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 
-if( !function_exists( 'aiconfig' ) )
+if (!function_exists('aiconfig'))
 {
     /**
      * Returns the configuration setting for the given key
@@ -16,14 +16,14 @@ 
      * @param mixed $default Default value if the configuration key isn't found
      * @return mixed Configuration value
      */
-    function aiconfig( $key, $default = null )
+    function aiconfig($key, $default = null)
     {
-        return app( '\Aimeos\Shop\Base\Config' )->get()->get( $key, $default );
+        return app('\Aimeos\Shop\Base\Config')->get()->get($key, $default);
     }
 }
 
 
-if( !function_exists( 'aitrans' ) )
+if (!function_exists('aitrans'))
 {
     /**
      * Translates the given message
@@ -34,16 +34,16 @@ 
      * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US"
      * @return string Translated string
      */
-    function aitrans( $singular, array $params = array(), $domain = 'client', $locale = null )
+    function aitrans($singular, array $params = array(), $domain = 'client', $locale = null)
     {
-        $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale );
+        $i18n = app('\Aimeos\Shop\Base\Context')->get()->getI18n($locale);
 
-        return vsprintf( $i18n->dt( $domain, $singular ), $params );
+        return vsprintf($i18n->dt($domain, $singular), $params);
     }
 }
 
 
-if( !function_exists( 'aitransplural' ) )
+if (!function_exists('aitransplural'))
 {
     /**
      * Translates the given messages based on the number
@@ -56,10 +56,10 @@ 
      * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US"
      * @return string Translated string
      */
-    function aitransplural( $singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null )
+    function aitransplural($singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null)
     {
-        $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale );
+        $i18n = app('\Aimeos\Shop\Base\Context')->get()->getI18n($locale);
 
-        return vsprintf( $i18n->dn( $domain, $singular, $plural, $number ), $params );
+        return vsprintf($i18n->dn($domain, $singular, $plural, $number), $params);
     }
 }

src/Aimeos/Shop/ShopServiceProvider.php

Spacing +2 added lines, -2 removed lines

@@ -106,12 +106,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/Controller/JqadmController.php

Spacing +49 added lines, -49 removed lines

@@ -34,38 +34,38 @@ 
 	 */
 	public function fileAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
 		}
 
 		$contents = '';
 		$files = array();
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
-		$type = Route::input( 'type', Input::get( 'type', 'js' ) );
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
+		$type = Route::input('type', Input::get('type', 'js'));
 
-		foreach( $aimeos->getCustomPaths( 'admin/jqadm' ) as $base => $paths )
+		foreach ($aimeos->getCustomPaths('admin/jqadm') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
-				$jsbAbsPath = $base . '/' . $path;
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
-				$files = array_merge( $files, $jsb2->getFiles( $type ) );
+				$jsbAbsPath = $base.'/'.$path;
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
+				$files = array_merge($files, $jsb2->getFiles($type));
 			}
 		}
 
-		foreach( $files as $file )
+		foreach ($files as $file)
 		{
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
+			if (($content = file_get_contents($file)) !== false) {
 				$contents .= $content;
 			}
 		}
 
-		$response = response( $contents );
+		$response = response($contents);
 
-		if( $type === 'js' ) {
-			$response->header( 'Content-Type', 'application/javascript' );
-		} elseif( $type === 'css' ) {
-			$response->header( 'Content-Type', 'text/css' );
+		if ($type === 'js') {
+			$response->header('Content-Type', 'application/javascript');
+		} elseif ($type === 'css') {
+			$response->header('Content-Type', 'text/css');
 		}
 
 		return $response;
@@ -79,12 +79,12 @@ 
 	 */
 	public function copyAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
 		}
 
 		$cntl = $this->createClient();
-		return $this->getHtml( $cntl->copy() );
+		return $this->getHtml($cntl->copy());
 	}
 
 
@@ -95,12 +95,12 @@ 
 	 */
 	public function createAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
 		}
 
 		$cntl = $this->createClient();
-		return $this->getHtml( $cntl->create() );
+		return $this->getHtml($cntl->create());
 	}
 
 
@@ -111,12 +111,12 @@ 
 	 */
 	public function deleteAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
 		}
 
 		$cntl = $this->createClient();
-		return $this->getHtml( $cntl->delete() . $cntl->search() );
+		return $this->getHtml($cntl->delete().$cntl->search());
 	}
 
 
@@ -127,12 +127,12 @@ 
 	 */
 	public function getAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
 		}
 
 		$cntl = $this->createClient();
-		return $this->getHtml( $cntl->get() );
+		return $this->getHtml($cntl->get());
 	}
 
 
@@ -143,12 +143,12 @@ 
 	 */
 	public function saveAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
 		}
 
 		$cntl = $this->createClient();
-		return $this->getHtml( ( $cntl->save() ? : $cntl->search() ) );
+		return $this->getHtml(($cntl->save() ?: $cntl->search()));
 	}
 
 
@@ -159,12 +159,12 @@ 
 	 */
 	public function searchAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
 		}
 
 		$cntl = $this->createClient();
-		return $this->getHtml( $cntl->search() );
+		return $this->getHtml($cntl->search());
 	}
 
 
@@ -175,19 +175,19 @@ 
 	 */
 	protected function createClient()
 	{
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
-		$lang = Input::get( 'lang', config( 'app.locale', 'en' ) );
-		$resource = Route::input( 'resource' );
+		$site = Route::input('site', Input::get('site', 'default'));
+		$lang = Input::get('lang', config('app.locale', 'en'));
+		$resource = Route::input('resource');
 
-		$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, 'backend' );
-		$context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang, 'en' ) ) );
-		$context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) );
-		$context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $templatePaths, $lang ) );
+		$context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend');
+		$context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en')));
+		$context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site));
+		$context->setView(app('\Aimeos\Shop\Base\View')->create($context, $templatePaths, $lang));
 
-		return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource );
+		return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource);
 	}
 
 
@@ -197,12 +197,12 @@ 
 	 * @param string $content Content from admin client
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
 	 */
-	protected function getHtml( $content )
+	protected function getHtml($content)
 	{
-		$version = app( '\Aimeos\Shop\Base\Aimeos' )->getVersion();
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
-		$content = str_replace( ['{type}', '{version}'], ['Laravel', $version], $content );
+		$version = app('\Aimeos\Shop\Base\Aimeos')->getVersion();
+		$site = Route::input('site', Input::get('site', 'default'));
+		$content = str_replace(['{type}', '{version}'], ['Laravel', $version], $content);
 
-		return View::make( 'shop::jqadm.index', array( 'content' => $content, 'site' => $site ) );
+		return View::make('shop::jqadm.index', array('content' => $content, 'site' => $site));
 	}
 }