@@ -22,19 +22,19 @@  | 
                                                    ||
| 22 | 22 | * @param string|array $sites Unique site codes  | 
                                                        
| 23 | 23 | * @return \Aimeos\MShop\Locale\Item\Site\Iface[] List of site items  | 
                                                        
| 24 | 24 | */  | 
                                                        
| 25 | - protected function getSiteItems( \Aimeos\MShop\Context\Item\Iface $context, $sites )  | 
                                                        |
| 25 | + protected function getSiteItems(\Aimeos\MShop\Context\Item\Iface $context, $sites)  | 
                                                        |
| 26 | 26 |  	{ | 
                                                        
| 27 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );  | 
                                                        |
| 27 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');  | 
                                                        |
| 28 | 28 | $search = $manager->createSearch();  | 
                                                        
| 29 | 29 | |
| 30 | -		if( is_scalar( $sites ) && $sites != '' ) { | 
                                                        |
| 31 | - $sites = explode( ' ', $sites );  | 
                                                        |
| 30 | +		if (is_scalar($sites) && $sites != '') { | 
                                                        |
| 31 | +			$sites = explode(' ', $sites); | 
                                                        |
| 32 | 32 | }  | 
                                                        
| 33 | 33 | |
| 34 | -		if( !empty( $sites ) ) { | 
                                                        |
| 35 | - $search->setConditions( $search->compare( '==', 'locale.site.code', $sites ) );  | 
                                                        |
| 34 | +		if (!empty($sites)) { | 
                                                        |
| 35 | +			$search->setConditions($search->compare('==', 'locale.site.code', $sites)); | 
                                                        |
| 36 | 36 | }  | 
                                                        
| 37 | 37 | |
| 38 | - return $manager->searchItems( $search );  | 
                                                        |
| 38 | + return $manager->searchItems($search);  | 
                                                        |
| 39 | 39 | }  | 
                                                        
| 40 | 40 | }  | 
                                                        
| 41 | 41 | \ No newline at end of file  | 
                                                        
@@ -135,7 +135,7 @@  | 
                                                    ||
| 135 | 135 | * Creates a list of all available translations.  | 
                                                        
| 136 | 136 | *  | 
                                                        
| 137 | 137 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object  | 
                                                        
| 138 | - * @return array List of language IDs with labels  | 
                                                        |
| 138 | + * @return string List of language IDs with labels  | 
                                                        |
| 139 | 139 | */  | 
                                                        
| 140 | 140 | protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context )  | 
                                                        
| 141 | 141 |  	{ | 
                                                        
@@ -34,65 +34,65 @@ discard block  | 
                                                    ||
| 34 | 34 | * @param \Illuminate\Http\Request $request Laravel request object  | 
                                                        
| 35 | 35 | * @return \Illuminate\Contracts\View\View View for rendering the output  | 
                                                        
| 36 | 36 | */  | 
                                                        
| 37 | - public function indexAction( Request $request )  | 
                                                        |
| 37 | + public function indexAction(Request $request)  | 
                                                        |
| 38 | 38 |  	{ | 
                                                        
| 39 | -		if( config( 'shop.authorize', true ) ) { | 
                                                        |
| 40 | - $this->authorize( 'admin', [ExtadmController::class, ['admin']] );  | 
                                                        |
| 39 | +		if (config('shop.authorize', true)) { | 
                                                        |
| 40 | +			$this->authorize('admin', [ExtadmController::class, ['admin']]); | 
                                                        |
| 41 | 41 | }  | 
                                                        
| 42 | 42 | |
| 43 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) );  | 
                                                        |
| 44 | - $lang = Route::input( 'lang', Input::get( 'lang', config( 'app.locale', 'en' ) ) );  | 
                                                        |
| 45 | - $tab = Route::input( 'tab', Input::get( 'tab', 0 ) );  | 
                                                        |
| 43 | +		$site = Route::input('site', Input::get('site', 'default')); | 
                                                        |
| 44 | +		$lang = Route::input('lang', Input::get('lang', config('app.locale', 'en'))); | 
                                                        |
| 45 | +		$tab = Route::input('tab', Input::get('tab', 0)); | 
                                                        |
| 46 | 46 | |
| 47 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' );  | 
                                                        |
| 47 | +		$aimeos = app('\Aimeos\Shop\Base\Aimeos'); | 
                                                        |
| 48 | 48 | |
| 49 | 49 | $bootstrap = $aimeos->get();  | 
                                                        
| 50 | - $cntlPaths = $bootstrap->getCustomPaths( 'controller/extjs' );  | 
                                                        |
| 50 | +		$cntlPaths = $bootstrap->getCustomPaths('controller/extjs'); | 
                                                        |
| 51 | 51 | |
| 52 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' );  | 
                                                        |
| 53 | -		$context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) ); | 
                                                        |
| 52 | +		$context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend'); | 
                                                        |
| 53 | +		$context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site)); | 
                                                        |
| 54 | 54 | |
| 55 | - $controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );  | 
                                                        |
| 55 | + $controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);  | 
                                                        |
| 56 | 56 | $cssFiles = array();  | 
                                                        
| 57 | 57 | |
| 58 | - foreach( $bootstrap->getCustomPaths( 'admin/extjs' ) as $base => $paths )  | 
                                                        |
| 58 | +		foreach ($bootstrap->getCustomPaths('admin/extjs') as $base => $paths) | 
                                                        |
| 59 | 59 |  		{ | 
                                                        
| 60 | - foreach( $paths as $path )  | 
                                                        |
| 60 | + foreach ($paths as $path)  | 
                                                        |
| 61 | 61 |  			{ | 
                                                        
| 62 | - $jsbAbsPath = $base . '/' . $path;  | 
                                                        |
| 62 | + $jsbAbsPath = $base.'/'.$path;  | 
                                                        |
| 63 | 63 | |
| 64 | -				if( !is_file( $jsbAbsPath ) ) { | 
                                                        |
| 65 | - throw new \Exception( sprintf( 'JSB2 file "%1$s" not found', $jsbAbsPath ) );  | 
                                                        |
| 64 | +				if (!is_file($jsbAbsPath)) { | 
                                                        |
| 65 | +					throw new \Exception(sprintf('JSB2 file "%1$s" not found', $jsbAbsPath)); | 
                                                        |
| 66 | 66 | }  | 
                                                        
| 67 | 67 | |
| 68 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $path ) );  | 
                                                        |
| 69 | - $cssFiles = array_merge( $cssFiles, $jsb2->getUrls( 'css' ) );  | 
                                                        |
| 68 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($path));  | 
                                                        |
| 69 | +				$cssFiles = array_merge($cssFiles, $jsb2->getUrls('css')); | 
                                                        |
| 70 | 70 | }  | 
                                                        
| 71 | 71 | }  | 
                                                        
| 72 | 72 | |
| 73 | - $jqadmUrl = route( 'aimeos_shop_jqadm_search', array( 'site' => $site, 'resource' => 'product' ) );  | 
                                                        |
| 74 | - $jsonUrl = route( 'aimeos_shop_extadm_json', array( 'site' => $site, '_token' => csrf_token() ) );  | 
                                                        |
| 75 | - $adminUrl = route( 'aimeos_shop_extadm', array( 'site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>' ) );  | 
                                                        |
| 73 | +		$jqadmUrl = route('aimeos_shop_jqadm_search', array('site' => $site, 'resource' => 'product')); | 
                                                        |
| 74 | +		$jsonUrl = route('aimeos_shop_extadm_json', array('site' => $site, '_token' => csrf_token())); | 
                                                        |
| 75 | +		$adminUrl = route('aimeos_shop_extadm', array('site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>')); | 
                                                        |
| 76 | 76 | |
| 77 | 77 | $vars = array(  | 
                                                        
| 78 | 78 | 'site' => $site,  | 
                                                        
| 79 | 79 | 'lang' => $lang,  | 
                                                        
| 80 | 80 | 'cssFiles' => $cssFiles,  | 
                                                        
| 81 | - 'languages' => $this->getJsonLanguages( $context),  | 
                                                        |
| 82 | - 'config' => $this->getJsonClientConfig( $context ),  | 
                                                        |
| 83 | - 'siteitem' => $this->getJsonSiteItem( $context, $site ),  | 
                                                        |
| 84 | - 'i18nContent' => $this->getJsonClientI18n( $bootstrap->getI18nPaths(), $lang ),  | 
                                                        |
| 81 | + 'languages' => $this->getJsonLanguages($context),  | 
                                                        |
| 82 | + 'config' => $this->getJsonClientConfig($context),  | 
                                                        |
| 83 | + 'siteitem' => $this->getJsonSiteItem($context, $site),  | 
                                                        |
| 84 | + 'i18nContent' => $this->getJsonClientI18n($bootstrap->getI18nPaths(), $lang),  | 
                                                        |
| 85 | 85 | 'searchSchemas' => $controller->getJsonSearchSchemas(),  | 
                                                        
| 86 | 86 | 'itemSchemas' => $controller->getJsonItemSchemas(),  | 
                                                        
| 87 | - 'smd' => $controller->getJsonSmd( $jsonUrl ),  | 
                                                        |
| 88 | -			'urlTemplate' => str_replace( ['<', '>'], ['{', '}'], urldecode( $adminUrl ) ), | 
                                                        |
| 89 | - 'uploaddir' => config( 'shop::uploaddir' ),  | 
                                                        |
| 87 | + 'smd' => $controller->getJsonSmd($jsonUrl),  | 
                                                        |
| 88 | +			'urlTemplate' => str_replace(['<', '>'], ['{', '}'], urldecode($adminUrl)), | 
                                                        |
| 89 | +			'uploaddir' => config('shop::uploaddir'), | 
                                                        |
| 90 | 90 | 'version' => $aimeos->getVersion(),  | 
                                                        
| 91 | 91 | 'jqadmurl' => $jqadmUrl,  | 
                                                        
| 92 | 92 | 'activeTab' => $tab,  | 
                                                        
| 93 | 93 | );  | 
                                                        
| 94 | 94 | |
| 95 | - return View::make( 'shop::extadm.index', $vars );  | 
                                                        |
| 95 | +		return View::make('shop::extadm.index', $vars); | 
                                                        |
| 96 | 96 | }  | 
                                                        
| 97 | 97 | |
| 98 | 98 | |
@@ -102,25 +102,25 @@ discard block  | 
                                                    ||
| 102 | 102 | * @param \Illuminate\Http\Request $request Laravel request object  | 
                                                        
| 103 | 103 | * @return \Illuminate\Contracts\View\View View for rendering the output  | 
                                                        
| 104 | 104 | */  | 
                                                        
| 105 | - public function doAction( Request $request )  | 
                                                        |
| 105 | + public function doAction(Request $request)  | 
                                                        |
| 106 | 106 |  	{ | 
                                                        
| 107 | -		if( config( 'shop.authorize', true ) ) { | 
                                                        |
| 108 | - $this->authorize( 'admin', [ExtadmController::class, ['admin']] );  | 
                                                        |
| 107 | +		if (config('shop.authorize', true)) { | 
                                                        |
| 108 | +			$this->authorize('admin', [ExtadmController::class, ['admin']]); | 
                                                        |
| 109 | 109 | }  | 
                                                        
| 110 | 110 | |
| 111 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) );  | 
                                                        |
| 111 | +		$site = Route::input('site', Input::get('site', 'default')); | 
                                                        |
| 112 | 112 | |
| 113 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();  | 
                                                        |
| 114 | - $cntlPaths = $aimeos->getCustomPaths( 'controller/extjs' );  | 
                                                        |
| 113 | +		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); | 
                                                        |
| 114 | +		$cntlPaths = $aimeos->getCustomPaths('controller/extjs'); | 
                                                        |
| 115 | 115 | |
| 116 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' );  | 
                                                        |
| 117 | - $context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, array() ) );  | 
                                                        |
| 118 | -		$context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) ); | 
                                                        |
| 116 | +		$context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend'); | 
                                                        |
| 117 | +		$context->setView(app('\Aimeos\Shop\Base\View')->create($context, array())); | 
                                                        |
| 118 | +		$context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site)); | 
                                                        |
| 119 | 119 | |
| 120 | - $controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );  | 
                                                        |
| 120 | + $controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);  | 
                                                        |
| 121 | 121 | |
| 122 | - $response = $controller->process( Input::instance()->request->all(), $request->getContent() );  | 
                                                        |
| 123 | - return View::make( 'shop::extadm.do', array( 'output' => $response ) );  | 
                                                        |
| 122 | + $response = $controller->process(Input::instance()->request->all(), $request->getContent());  | 
                                                        |
| 123 | +		return View::make('shop::extadm.do', array('output' => $response)); | 
                                                        |
| 124 | 124 | }  | 
                                                        
| 125 | 125 | |
| 126 | 126 | |
@@ -131,32 +131,32 @@ discard block  | 
                                                    ||
| 131 | 131 | */  | 
                                                        
| 132 | 132 | public function fileAction()  | 
                                                        
| 133 | 133 |  	{ | 
                                                        
| 134 | -		if( config( 'shop.authorize', true ) ) { | 
                                                        |
| 135 | - $this->authorize( 'admin', [ExtadmController::class, ['admin']] );  | 
                                                        |
| 134 | +		if (config('shop.authorize', true)) { | 
                                                        |
| 135 | +			$this->authorize('admin', [ExtadmController::class, ['admin']]); | 
                                                        |
| 136 | 136 | }  | 
                                                        
| 137 | 137 | |
| 138 | 138 | $contents = '';  | 
                                                        
| 139 | 139 | $jsFiles = array();  | 
                                                        
| 140 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();  | 
                                                        |
| 140 | +		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); | 
                                                        |
| 141 | 141 | |
| 142 | - foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths )  | 
                                                        |
| 142 | +		foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths) | 
                                                        |
| 143 | 143 |  		{ | 
                                                        
| 144 | - foreach( $paths as $path )  | 
                                                        |
| 144 | + foreach ($paths as $path)  | 
                                                        |
| 145 | 145 |  			{ | 
                                                        
| 146 | - $jsbAbsPath = $base . '/' . $path;  | 
                                                        |
| 147 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );  | 
                                                        |
| 148 | - $jsFiles = array_merge( $jsFiles, $jsb2->getFiles( 'js' ) );  | 
                                                        |
| 146 | + $jsbAbsPath = $base.'/'.$path;  | 
                                                        |
| 147 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));  | 
                                                        |
| 148 | +				$jsFiles = array_merge($jsFiles, $jsb2->getFiles('js')); | 
                                                        |
| 149 | 149 | }  | 
                                                        
| 150 | 150 | }  | 
                                                        
| 151 | 151 | |
| 152 | - foreach( $jsFiles as $file )  | 
                                                        |
| 152 | + foreach ($jsFiles as $file)  | 
                                                        |
| 153 | 153 |  		{ | 
                                                        
| 154 | -			if( ( $content = file_get_contents( $file ) ) !== false ) { | 
                                                        |
| 154 | +			if (($content = file_get_contents($file)) !== false) { | 
                                                        |
| 155 | 155 | $contents .= $content;  | 
                                                        
| 156 | 156 | }  | 
                                                        
| 157 | 157 | }  | 
                                                        
| 158 | 158 | |
| 159 | - return response( $contents )->header( 'Content-Type', 'application/javascript' );  | 
                                                        |
| 159 | +		return response($contents)->header('Content-Type', 'application/javascript'); | 
                                                        |
| 160 | 160 | }  | 
                                                        
| 161 | 161 | |
| 162 | 162 | |
@@ -166,15 +166,15 @@ discard block  | 
                                                    ||
| 166 | 166 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object  | 
                                                        
| 167 | 167 | * @return array List of language IDs with labels  | 
                                                        
| 168 | 168 | */  | 
                                                        
| 169 | - protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context )  | 
                                                        |
| 169 | + protected function getJsonLanguages(\Aimeos\MShop\Context\Item\Iface $context)  | 
                                                        |
| 170 | 170 |  	{ | 
                                                        
| 171 | 171 | $result = array();  | 
                                                        
| 172 | 172 | |
| 173 | -		foreach( app( '\Aimeos\Shop\Base\Aimeos' )->get()->getI18nList( 'admin' ) as $id ) { | 
                                                        |
| 174 | - $result[] = array( 'id' => $id, 'label' => $id );  | 
                                                        |
| 173 | +		foreach (app('\Aimeos\Shop\Base\Aimeos')->get()->getI18nList('admin') as $id) { | 
                                                        |
| 174 | +			$result[] = array('id' => $id, 'label' => $id); | 
                                                        |
| 175 | 175 | }  | 
                                                        
| 176 | 176 | |
| 177 | - return json_encode( $result );  | 
                                                        |
| 177 | + return json_encode($result);  | 
                                                        |
| 178 | 178 | }  | 
                                                        
| 179 | 179 | |
| 180 | 180 | |
@@ -184,10 +184,10 @@ discard block  | 
                                                    ||
| 184 | 184 | * @param \Aimeos\MShop\Context\Item\Iface $context Context item object  | 
                                                        
| 185 | 185 | * @return string JSON encoded configuration object  | 
                                                        
| 186 | 186 | */  | 
                                                        
| 187 | - protected function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context )  | 
                                                        |
| 187 | + protected function getJsonClientConfig(\Aimeos\MShop\Context\Item\Iface $context)  | 
                                                        |
| 188 | 188 |  	{ | 
                                                        
| 189 | - $config = $context->getConfig()->get( 'admin/extjs', array() );  | 
                                                        |
| 190 | - return json_encode( array( 'admin' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT );  | 
                                                        |
| 189 | +		$config = $context->getConfig()->get('admin/extjs', array()); | 
                                                        |
| 190 | +		return json_encode(array('admin' => array('extjs' => $config)), JSON_FORCE_OBJECT); | 
                                                        |
| 191 | 191 | }  | 
                                                        
| 192 | 192 | |
| 193 | 193 | |
@@ -198,16 +198,16 @@ discard block  | 
                                                    ||
| 198 | 198 | * @param string $lang ISO language code like "en" or "en_GB"  | 
                                                        
| 199 | 199 | * @return string JSON encoded translation object  | 
                                                        
| 200 | 200 | */  | 
                                                        
| 201 | - protected function getJsonClientI18n( array $i18nPaths, $lang )  | 
                                                        |
| 201 | + protected function getJsonClientI18n(array $i18nPaths, $lang)  | 
                                                        |
| 202 | 202 |  	{ | 
                                                        
| 203 | - $i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $lang );  | 
                                                        |
| 203 | + $i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $lang);  | 
                                                        |
| 204 | 204 | |
| 205 | 205 | $content = array(  | 
                                                        
| 206 | - 'admin' => $i18n->getAll( 'admin' ),  | 
                                                        |
| 207 | - 'admin/ext' => $i18n->getAll( 'admin/ext' ),  | 
                                                        |
| 206 | +			'admin' => $i18n->getAll('admin'), | 
                                                        |
| 207 | +			'admin/ext' => $i18n->getAll('admin/ext'), | 
                                                        |
| 208 | 208 | );  | 
                                                        
| 209 | 209 | |
| 210 | - return json_encode( $content, JSON_FORCE_OBJECT );  | 
                                                        |
| 210 | + return json_encode($content, JSON_FORCE_OBJECT);  | 
                                                        |
| 211 | 211 | }  | 
                                                        
| 212 | 212 | |
| 213 | 213 | |
@@ -219,18 +219,18 @@ discard block  | 
                                                    ||
| 219 | 219 | * @return string JSON encoded site item object  | 
                                                        
| 220 | 220 | * @throws Exception If no site item was found for the code  | 
                                                        
| 221 | 221 | */  | 
                                                        
| 222 | - protected function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site )  | 
                                                        |
| 222 | + protected function getJsonSiteItem(\Aimeos\MShop\Context\Item\Iface $context, $site)  | 
                                                        |
| 223 | 223 |  	{ | 
                                                        
| 224 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );  | 
                                                        |
| 224 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');  | 
                                                        |
| 225 | 225 | |
| 226 | 226 | $criteria = $manager->createSearch();  | 
                                                        
| 227 | - $criteria->setConditions( $criteria->compare( '==', 'locale.site.code', $site ) );  | 
                                                        |
| 228 | - $items = $manager->searchItems( $criteria );  | 
                                                        |
| 227 | +		$criteria->setConditions($criteria->compare('==', 'locale.site.code', $site)); | 
                                                        |
| 228 | + $items = $manager->searchItems($criteria);  | 
                                                        |
| 229 | 229 | |
| 230 | -		if( ( $item = reset( $items ) ) === false ) { | 
                                                        |
| 231 | - throw new \Exception( sprintf( 'No site found for code "%1$s"', $site ) );  | 
                                                        |
| 230 | +		if (($item = reset($items)) === false) { | 
                                                        |
| 231 | +			throw new \Exception(sprintf('No site found for code "%1$s"', $site)); | 
                                                        |
| 232 | 232 | }  | 
                                                        
| 233 | 233 | |
| 234 | - return json_encode( $item->toArray() );  | 
                                                        |
| 234 | + return json_encode($item->toArray());  | 
                                                        |
| 235 | 235 | }  | 
                                                        
| 236 | 236 | }  | 
                                                        
| 237 | 237 | \ No newline at end of file  | 
                                                        
@@ -75,7 +75,7 @@ discard block  | 
                                                    ||
| 75 | 75 | /**  | 
                                                        
| 76 | 76 | * Returns the HTML code for a copy of a resource object  | 
                                                        
| 77 | 77 | *  | 
                                                        
| 78 | - * @return string Generated output  | 
                                                        |
| 78 | + * @return \Illuminate\Contracts\View\View Generated output  | 
                                                        |
| 79 | 79 | */  | 
                                                        
| 80 | 80 | public function copyAction()  | 
                                                        
| 81 | 81 |  	{ | 
                                                        
@@ -91,7 +91,7 @@ discard block  | 
                                                    ||
| 91 | 91 | /**  | 
                                                        
| 92 | 92 | * Returns the HTML code for a new resource object  | 
                                                        
| 93 | 93 | *  | 
                                                        
| 94 | - * @return string Generated output  | 
                                                        |
| 94 | + * @return \Illuminate\Contracts\View\View Generated output  | 
                                                        |
| 95 | 95 | */  | 
                                                        
| 96 | 96 | public function createAction()  | 
                                                        
| 97 | 97 |  	{ | 
                                                        
@@ -107,7 +107,7 @@ discard block  | 
                                                    ||
| 107 | 107 | /**  | 
                                                        
| 108 | 108 | * Deletes the resource object or a list of resource objects  | 
                                                        
| 109 | 109 | *  | 
                                                        
| 110 | - * @return string Generated output  | 
                                                        |
| 110 | + * @return \Illuminate\Contracts\View\View Generated output  | 
                                                        |
| 111 | 111 | */  | 
                                                        
| 112 | 112 | public function deleteAction()  | 
                                                        
| 113 | 113 |  	{ | 
                                                        
@@ -123,7 +123,7 @@ discard block  | 
                                                    ||
| 123 | 123 | /**  | 
                                                        
| 124 | 124 | * Returns the HTML code for the requested resource object  | 
                                                        
| 125 | 125 | *  | 
                                                        
| 126 | - * @return string Generated output  | 
                                                        |
| 126 | + * @return \Illuminate\Contracts\View\View Generated output  | 
                                                        |
| 127 | 127 | */  | 
                                                        
| 128 | 128 | public function getAction()  | 
                                                        
| 129 | 129 |  	{ | 
                                                        
@@ -139,7 +139,7 @@ discard block  | 
                                                    ||
| 139 | 139 | /**  | 
                                                        
| 140 | 140 | * Saves a new resource object  | 
                                                        
| 141 | 141 | *  | 
                                                        
| 142 | - * @return string Generated output  | 
                                                        |
| 142 | + * @return \Illuminate\Contracts\View\View Generated output  | 
                                                        |
| 143 | 143 | */  | 
                                                        
| 144 | 144 | public function saveAction()  | 
                                                        
| 145 | 145 |  	{ | 
                                                        
@@ -155,7 +155,7 @@ discard block  | 
                                                    ||
| 155 | 155 | /**  | 
                                                        
| 156 | 156 | * Returns the HTML code for a list of resource objects  | 
                                                        
| 157 | 157 | *  | 
                                                        
| 158 | - * @return string Generated output  | 
                                                        |
| 158 | + * @return \Illuminate\Contracts\View\View Generated output  | 
                                                        |
| 159 | 159 | */  | 
                                                        
| 160 | 160 | public function searchAction()  | 
                                                        
| 161 | 161 |  	{ | 
                                                        
@@ -34,38 +34,38 @@ discard block  | 
                                                    ||
| 34 | 34 | */  | 
                                                        
| 35 | 35 | public function fileAction()  | 
                                                        
| 36 | 36 |  	{ | 
                                                        
| 37 | -		if( config( 'shop.authorize', true ) ) { | 
                                                        |
| 38 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );  | 
                                                        |
| 37 | +		if (config('shop.authorize', true)) { | 
                                                        |
| 38 | +			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); | 
                                                        |
| 39 | 39 | }  | 
                                                        
| 40 | 40 | |
| 41 | 41 | $contents = '';  | 
                                                        
| 42 | 42 | $files = array();  | 
                                                        
| 43 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();  | 
                                                        |
| 44 | - $type = Route::input( 'type', Input::get( 'type', 'js' ) );  | 
                                                        |
| 43 | +		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); | 
                                                        |
| 44 | +		$type = Route::input('type', Input::get('type', 'js')); | 
                                                        |
| 45 | 45 | |
| 46 | - foreach( $aimeos->getCustomPaths( 'admin/jqadm' ) as $base => $paths )  | 
                                                        |
| 46 | +		foreach ($aimeos->getCustomPaths('admin/jqadm') as $base => $paths) | 
                                                        |
| 47 | 47 |  		{ | 
                                                        
| 48 | - foreach( $paths as $path )  | 
                                                        |
| 48 | + foreach ($paths as $path)  | 
                                                        |
| 49 | 49 |  			{ | 
                                                        
| 50 | - $jsbAbsPath = $base . '/' . $path;  | 
                                                        |
| 51 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );  | 
                                                        |
| 52 | - $files = array_merge( $files, $jsb2->getFiles( $type ) );  | 
                                                        |
| 50 | + $jsbAbsPath = $base.'/'.$path;  | 
                                                        |
| 51 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));  | 
                                                        |
| 52 | + $files = array_merge($files, $jsb2->getFiles($type));  | 
                                                        |
| 53 | 53 | }  | 
                                                        
| 54 | 54 | }  | 
                                                        
| 55 | 55 | |
| 56 | - foreach( $files as $file )  | 
                                                        |
| 56 | + foreach ($files as $file)  | 
                                                        |
| 57 | 57 |  		{ | 
                                                        
| 58 | -			if( ( $content = file_get_contents( $file ) ) !== false ) { | 
                                                        |
| 58 | +			if (($content = file_get_contents($file)) !== false) { | 
                                                        |
| 59 | 59 | $contents .= $content;  | 
                                                        
| 60 | 60 | }  | 
                                                        
| 61 | 61 | }  | 
                                                        
| 62 | 62 | |
| 63 | - $response = response( $contents );  | 
                                                        |
| 63 | + $response = response($contents);  | 
                                                        |
| 64 | 64 | |
| 65 | -		if( $type === 'js' ) { | 
                                                        |
| 66 | - $response->header( 'Content-Type', 'application/javascript' );  | 
                                                        |
| 67 | -		} elseif( $type === 'css' ) { | 
                                                        |
| 68 | - $response->header( 'Content-Type', 'text/css' );  | 
                                                        |
| 65 | +		if ($type === 'js') { | 
                                                        |
| 66 | +			$response->header('Content-Type', 'application/javascript'); | 
                                                        |
| 67 | +		} elseif ($type === 'css') { | 
                                                        |
| 68 | +			$response->header('Content-Type', 'text/css'); | 
                                                        |
| 69 | 69 | }  | 
                                                        
| 70 | 70 | |
| 71 | 71 | return $response;  | 
                                                        
@@ -79,12 +79,12 @@ discard block  | 
                                                    ||
| 79 | 79 | */  | 
                                                        
| 80 | 80 | public function copyAction()  | 
                                                        
| 81 | 81 |  	{ | 
                                                        
| 82 | -		if( config( 'shop.authorize', true ) ) { | 
                                                        |
| 83 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );  | 
                                                        |
| 82 | +		if (config('shop.authorize', true)) { | 
                                                        |
| 83 | +			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); | 
                                                        |
| 84 | 84 | }  | 
                                                        
| 85 | 85 | |
| 86 | 86 | $cntl = $this->createClient();  | 
                                                        
| 87 | - return $this->getHtml( $cntl->copy() );  | 
                                                        |
| 87 | + return $this->getHtml($cntl->copy());  | 
                                                        |
| 88 | 88 | }  | 
                                                        
| 89 | 89 | |
| 90 | 90 | |
@@ -95,12 +95,12 @@ discard block  | 
                                                    ||
| 95 | 95 | */  | 
                                                        
| 96 | 96 | public function createAction()  | 
                                                        
| 97 | 97 |  	{ | 
                                                        
| 98 | -		if( config( 'shop.authorize', true ) ) { | 
                                                        |
| 99 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );  | 
                                                        |
| 98 | +		if (config('shop.authorize', true)) { | 
                                                        |
| 99 | +			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); | 
                                                        |
| 100 | 100 | }  | 
                                                        
| 101 | 101 | |
| 102 | 102 | $cntl = $this->createClient();  | 
                                                        
| 103 | - return $this->getHtml( $cntl->create() );  | 
                                                        |
| 103 | + return $this->getHtml($cntl->create());  | 
                                                        |
| 104 | 104 | }  | 
                                                        
| 105 | 105 | |
| 106 | 106 | |
@@ -111,12 +111,12 @@ discard block  | 
                                                    ||
| 111 | 111 | */  | 
                                                        
| 112 | 112 | public function deleteAction()  | 
                                                        
| 113 | 113 |  	{ | 
                                                        
| 114 | -		if( config( 'shop.authorize', true ) ) { | 
                                                        |
| 115 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );  | 
                                                        |
| 114 | +		if (config('shop.authorize', true)) { | 
                                                        |
| 115 | +			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); | 
                                                        |
| 116 | 116 | }  | 
                                                        
| 117 | 117 | |
| 118 | 118 | $cntl = $this->createClient();  | 
                                                        
| 119 | - return $this->getHtml( $cntl->delete() . $cntl->search() );  | 
                                                        |
| 119 | + return $this->getHtml($cntl->delete().$cntl->search());  | 
                                                        |
| 120 | 120 | }  | 
                                                        
| 121 | 121 | |
| 122 | 122 | |
@@ -127,12 +127,12 @@ discard block  | 
                                                    ||
| 127 | 127 | */  | 
                                                        
| 128 | 128 | public function getAction()  | 
                                                        
| 129 | 129 |  	{ | 
                                                        
| 130 | -		if( config( 'shop.authorize', true ) ) { | 
                                                        |
| 131 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );  | 
                                                        |
| 130 | +		if (config('shop.authorize', true)) { | 
                                                        |
| 131 | +			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); | 
                                                        |
| 132 | 132 | }  | 
                                                        
| 133 | 133 | |
| 134 | 134 | $cntl = $this->createClient();  | 
                                                        
| 135 | - return $this->getHtml( $cntl->get() );  | 
                                                        |
| 135 | + return $this->getHtml($cntl->get());  | 
                                                        |
| 136 | 136 | }  | 
                                                        
| 137 | 137 | |
| 138 | 138 | |
@@ -143,12 +143,12 @@ discard block  | 
                                                    ||
| 143 | 143 | */  | 
                                                        
| 144 | 144 | public function saveAction()  | 
                                                        
| 145 | 145 |  	{ | 
                                                        
| 146 | -		if( config( 'shop.authorize', true ) ) { | 
                                                        |
| 147 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );  | 
                                                        |
| 146 | +		if (config('shop.authorize', true)) { | 
                                                        |
| 147 | +			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); | 
                                                        |
| 148 | 148 | }  | 
                                                        
| 149 | 149 | |
| 150 | 150 | $cntl = $this->createClient();  | 
                                                        
| 151 | - return $this->getHtml( ( $cntl->save() ? : $cntl->search() ) );  | 
                                                        |
| 151 | + return $this->getHtml(($cntl->save() ?: $cntl->search()));  | 
                                                        |
| 152 | 152 | }  | 
                                                        
| 153 | 153 | |
| 154 | 154 | |
@@ -159,12 +159,12 @@ discard block  | 
                                                    ||
| 159 | 159 | */  | 
                                                        
| 160 | 160 | public function searchAction()  | 
                                                        
| 161 | 161 |  	{ | 
                                                        
| 162 | -		if( config( 'shop.authorize', true ) ) { | 
                                                        |
| 163 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );  | 
                                                        |
| 162 | +		if (config('shop.authorize', true)) { | 
                                                        |
| 163 | +			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); | 
                                                        |
| 164 | 164 | }  | 
                                                        
| 165 | 165 | |
| 166 | 166 | $cntl = $this->createClient();  | 
                                                        
| 167 | - return $this->getHtml( $cntl->search() );  | 
                                                        |
| 167 | + return $this->getHtml($cntl->search());  | 
                                                        |
| 168 | 168 | }  | 
                                                        
| 169 | 169 | |
| 170 | 170 | |
@@ -175,19 +175,19 @@ discard block  | 
                                                    ||
| 175 | 175 | */  | 
                                                        
| 176 | 176 | protected function createClient()  | 
                                                        
| 177 | 177 |  	{ | 
                                                        
| 178 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) );  | 
                                                        |
| 179 | - $lang = Input::get( 'lang', config( 'app.locale', 'en' ) );  | 
                                                        |
| 180 | - $resource = Route::input( 'resource' );  | 
                                                        |
| 178 | +		$site = Route::input('site', Input::get('site', 'default')); | 
                                                        |
| 179 | +		$lang = Input::get('lang', config('app.locale', 'en')); | 
                                                        |
| 180 | +		$resource = Route::input('resource'); | 
                                                        |
| 181 | 181 | |
| 182 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();  | 
                                                        |
| 183 | - $templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' );  | 
                                                        |
| 182 | +		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); | 
                                                        |
| 183 | +		$templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates'); | 
                                                        |
| 184 | 184 | |
| 185 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' );  | 
                                                        |
| 186 | -		$context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang, 'en' ) ) ); | 
                                                        |
| 187 | -		$context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) ); | 
                                                        |
| 188 | - $context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $templatePaths, $lang ) );  | 
                                                        |
| 185 | +		$context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend'); | 
                                                        |
| 186 | +		$context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en'))); | 
                                                        |
| 187 | +		$context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site)); | 
                                                        |
| 188 | +		$context->setView(app('\Aimeos\Shop\Base\View')->create($context, $templatePaths, $lang)); | 
                                                        |
| 189 | 189 | |
| 190 | - return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource );  | 
                                                        |
| 190 | + return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource);  | 
                                                        |
| 191 | 191 | }  | 
                                                        
| 192 | 192 | |
| 193 | 193 | |
@@ -197,12 +197,12 @@ discard block  | 
                                                    ||
| 197 | 197 | * @param string $content Content from admin client  | 
                                                        
| 198 | 198 | * @return \Illuminate\Contracts\View\View View for rendering the output  | 
                                                        
| 199 | 199 | */  | 
                                                        
| 200 | - protected function getHtml( $content )  | 
                                                        |
| 200 | + protected function getHtml($content)  | 
                                                        |
| 201 | 201 |  	{ | 
                                                        
| 202 | - $version = app( '\Aimeos\Shop\Base\Aimeos' )->getVersion();  | 
                                                        |
| 203 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) );  | 
                                                        |
| 204 | -		$content = str_replace( ['{type}', '{version}'], ['Laravel', $version], $content ); | 
                                                        |
| 202 | +		$version = app('\Aimeos\Shop\Base\Aimeos')->getVersion(); | 
                                                        |
| 203 | +		$site = Route::input('site', Input::get('site', 'default')); | 
                                                        |
| 204 | +		$content = str_replace(['{type}', '{version}'], ['Laravel', $version], $content); | 
                                                        |
| 205 | 205 | |
| 206 | - return View::make( 'shop::jqadm.index', array( 'content' => $content, 'site' => $site ) );  | 
                                                        |
| 206 | +		return View::make('shop::jqadm.index', array('content' => $content, 'site' => $site)); | 
                                                        |
| 207 | 207 | }  | 
                                                        
| 208 | 208 | }  | 
                                                        
@@ -30,7 +30,7 @@ discard block  | 
                                                    ||
| 30 | 30 | */  | 
                                                        
| 31 | 31 | public function indexAction()  | 
                                                        
| 32 | 32 |  	{ | 
                                                        
| 33 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'account-index' );  | 
                                                        |
| 33 | +		$params = app('\Aimeos\Shop\Base\Page')->getSections('account-index'); | 
                                                        |
| 34 | 34 |  		return View::make('shop::account.index', $params); | 
                                                        
| 35 | 35 | }  | 
                                                        
| 36 | 36 | |
@@ -42,17 +42,17 @@ discard block  | 
                                                    ||
| 42 | 42 | */  | 
                                                        
| 43 | 43 | public function downloadAction()  | 
                                                        
| 44 | 44 |  	{ | 
                                                        
| 45 | - $context = app( '\Aimeos\Shop\Base\Context' )->get();  | 
                                                        |
| 45 | +		$context = app('\Aimeos\Shop\Base\Context')->get(); | 
                                                        |
| 46 | 46 | $langid = $context->getLocale()->getLanguageId();  | 
                                                        
| 47 | 47 | |
| 48 | - $view = app( '\Aimeos\Shop\Base\View' )->create( $context, array(), $langid );  | 
                                                        |
| 49 | - $context->setView( $view );  | 
                                                        |
| 48 | +		$view = app('\Aimeos\Shop\Base\View')->create($context, array(), $langid); | 
                                                        |
| 49 | + $context->setView($view);  | 
                                                        |
| 50 | 50 | |
| 51 | - $client = \Aimeos\Client\Html\Factory::createClient( $context, array(), 'account/download' );  | 
                                                        |
| 52 | - $client->setView( $view );  | 
                                                        |
| 51 | + $client = \Aimeos\Client\Html\Factory::createClient($context, array(), 'account/download');  | 
                                                        |
| 52 | + $client->setView($view);  | 
                                                        |
| 53 | 53 | $client->process();  | 
                                                        
| 54 | 54 | |
| 55 | 55 | $response = $view->response();  | 
                                                        
| 56 | - return Response::make( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() );  | 
                                                        |
| 56 | + return Response::make((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders());  | 
                                                        |
| 57 | 57 | }  | 
                                                        
| 58 | 58 | }  | 
                                                        
| 59 | 59 | \ No newline at end of file  | 
                                                        
@@ -55,7 +55,7 @@ discard block  | 
                                                    ||
| 55 | 55 | * @param \Aimeos\Shop\Base\Locale $locale Locale object  | 
                                                        
| 56 | 56 | * @param \Aimeos\Shop\Base\I18n $i18n Internationalisation object  | 
                                                        
| 57 | 57 | */  | 
                                                        
| 58 | - public function __construct( \Illuminate\Session\Store $session, \Aimeos\Shop\Base\Config $config, \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\I18n $i18n )  | 
                                                        |
| 58 | + public function __construct(\Illuminate\Session\Store $session, \Aimeos\Shop\Base\Config $config, \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\I18n $i18n)  | 
                                                        |
| 59 | 59 |  	{ | 
                                                        
| 60 | 60 | $this->session = $session;  | 
                                                        
| 61 | 61 | $this->config = $config;  | 
                                                        
@@ -71,35 +71,35 @@ discard block  | 
                                                    ||
| 71 | 71 | * @param string $type Configuration type, i.e. "frontend" or "backend" (deprecated, use \Aimeos\Shop\Base\Config)  | 
                                                        
| 72 | 72 | * @return \Aimeos\MShop\Context\Item\Iface Context object  | 
                                                        
| 73 | 73 | */  | 
                                                        
| 74 | - public function get( $locale = true, $type = 'frontend' )  | 
                                                        |
| 74 | + public function get($locale = true, $type = 'frontend')  | 
                                                        |
| 75 | 75 |  	{ | 
                                                        
| 76 | - $config = $this->config->get( $type );  | 
                                                        |
| 76 | + $config = $this->config->get($type);  | 
                                                        |
| 77 | 77 | |
| 78 | - if( $this->context === null )  | 
                                                        |
| 78 | + if ($this->context === null)  | 
                                                        |
| 79 | 79 |  		{ | 
                                                        
| 80 | 80 | $context = new \Aimeos\MShop\Context\Item\Standard();  | 
                                                        
| 81 | - $context->setConfig( $config );  | 
                                                        |
| 82 | -  | 
                                                        |
| 83 | - $this->addDataBaseManager( $context );  | 
                                                        |
| 84 | - $this->addFilesystemManager( $context );  | 
                                                        |
| 85 | - $this->addMessageQueueManager( $context );  | 
                                                        |
| 86 | - $this->addLogger( $context );  | 
                                                        |
| 87 | - $this->addCache( $context );  | 
                                                        |
| 88 | - $this->addMailer( $context);  | 
                                                        |
| 89 | - $this->addSession( $context );  | 
                                                        |
| 90 | - $this->addUser( $context);  | 
                                                        |
| 91 | - $this->addGroups( $context);  | 
                                                        |
| 81 | + $context->setConfig($config);  | 
                                                        |
| 82 | +  | 
                                                        |
| 83 | + $this->addDataBaseManager($context);  | 
                                                        |
| 84 | + $this->addFilesystemManager($context);  | 
                                                        |
| 85 | + $this->addMessageQueueManager($context);  | 
                                                        |
| 86 | + $this->addLogger($context);  | 
                                                        |
| 87 | + $this->addCache($context);  | 
                                                        |
| 88 | + $this->addMailer($context);  | 
                                                        |
| 89 | + $this->addSession($context);  | 
                                                        |
| 90 | + $this->addUser($context);  | 
                                                        |
| 91 | + $this->addGroups($context);  | 
                                                        |
| 92 | 92 | |
| 93 | 93 | $this->context = $context;  | 
                                                        
| 94 | 94 | }  | 
                                                        
| 95 | 95 | |
| 96 | - $this->context->setConfig( $config );  | 
                                                        |
| 96 | + $this->context->setConfig($config);  | 
                                                        |
| 97 | 97 | |
| 98 | - if( $locale === true )  | 
                                                        |
| 98 | + if ($locale === true)  | 
                                                        |
| 99 | 99 |  		{ | 
                                                        
| 100 | - $localeItem = $this->locale->get( $this->context );  | 
                                                        |
| 101 | - $this->context->setLocale( $localeItem );  | 
                                                        |
| 102 | - $this->context->setI18n( $this->i18n->get( array( $localeItem->getLanguageId() ) ) );  | 
                                                        |
| 100 | + $localeItem = $this->locale->get($this->context);  | 
                                                        |
| 101 | + $this->context->setLocale($localeItem);  | 
                                                        |
| 102 | + $this->context->setI18n($this->i18n->get(array($localeItem->getLanguageId())));  | 
                                                        |
| 103 | 103 | }  | 
                                                        
| 104 | 104 | |
| 105 | 105 | return $this->context;  | 
                                                        
@@ -112,10 +112,10 @@ discard block  | 
                                                    ||
| 112 | 112 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object including config  | 
                                                        
| 113 | 113 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object  | 
                                                        
| 114 | 114 | */  | 
                                                        
| 115 | - protected function addCache( \Aimeos\MShop\Context\Item\Iface $context )  | 
                                                        |
| 115 | + protected function addCache(\Aimeos\MShop\Context\Item\Iface $context)  | 
                                                        |
| 116 | 116 |  	{ | 
                                                        
| 117 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context );  | 
                                                        |
| 118 | - $context->setCache( $cache );  | 
                                                        |
| 117 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context);  | 
                                                        |
| 118 | + $context->setCache($cache);  | 
                                                        |
| 119 | 119 | |
| 120 | 120 | return $context;  | 
                                                        
| 121 | 121 | }  | 
                                                        
@@ -127,10 +127,10 @@ discard block  | 
                                                    ||
| 127 | 127 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object  | 
                                                        
| 128 | 128 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object  | 
                                                        
| 129 | 129 | */  | 
                                                        
| 130 | - protected function addDatabaseManager( \Aimeos\MShop\Context\Item\Iface $context )  | 
                                                        |
| 130 | + protected function addDatabaseManager(\Aimeos\MShop\Context\Item\Iface $context)  | 
                                                        |
| 131 | 131 |  	{ | 
                                                        
| 132 | - $dbm = new \Aimeos\MW\DB\Manager\DBAL( $context->getConfig() );  | 
                                                        |
| 133 | - $context->setDatabaseManager( $dbm );  | 
                                                        |
| 132 | + $dbm = new \Aimeos\MW\DB\Manager\DBAL($context->getConfig());  | 
                                                        |
| 133 | + $context->setDatabaseManager($dbm);  | 
                                                        |
| 134 | 134 | |
| 135 | 135 | return $context;  | 
                                                        
| 136 | 136 | }  | 
                                                        
@@ -142,13 +142,13 @@ discard block  | 
                                                    ||
| 142 | 142 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object  | 
                                                        
| 143 | 143 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object  | 
                                                        
| 144 | 144 | */  | 
                                                        
| 145 | - protected function addFilesystemManager( \Aimeos\MShop\Context\Item\Iface $context )  | 
                                                        |
| 145 | + protected function addFilesystemManager(\Aimeos\MShop\Context\Item\Iface $context)  | 
                                                        |
| 146 | 146 |  	{ | 
                                                        
| 147 | 147 | $config = $context->getConfig();  | 
                                                        
| 148 | - $path = storage_path( 'aimeos' );  | 
                                                        |
| 148 | +		$path = storage_path('aimeos'); | 
                                                        |
| 149 | 149 | |
| 150 | - $fs = new \Aimeos\MW\Filesystem\Manager\Laravel( app( 'filesystem' ), $config, $path );  | 
                                                        |
| 151 | - $context->setFilesystemManager( $fs );  | 
                                                        |
| 150 | +		$fs = new \Aimeos\MW\Filesystem\Manager\Laravel(app('filesystem'), $config, $path); | 
                                                        |
| 151 | + $context->setFilesystemManager($fs);  | 
                                                        |
| 152 | 152 | |
| 153 | 153 | return $context;  | 
                                                        
| 154 | 154 | }  | 
                                                        
@@ -160,10 +160,10 @@ discard block  | 
                                                    ||
| 160 | 160 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object  | 
                                                        
| 161 | 161 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object  | 
                                                        
| 162 | 162 | */  | 
                                                        
| 163 | - protected function addLogger( \Aimeos\MShop\Context\Item\Iface $context )  | 
                                                        |
| 163 | + protected function addLogger(\Aimeos\MShop\Context\Item\Iface $context)  | 
                                                        |
| 164 | 164 |  	{ | 
                                                        
| 165 | - $logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager( $context );  | 
                                                        |
| 166 | - $context->setLogger( $logger );  | 
                                                        |
| 165 | + $logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager($context);  | 
                                                        |
| 166 | + $context->setLogger($logger);  | 
                                                        |
| 167 | 167 | |
| 168 | 168 | return $context;  | 
                                                        
| 169 | 169 | }  | 
                                                        
@@ -176,10 +176,10 @@ discard block  | 
                                                    ||
| 176 | 176 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object  | 
                                                        
| 177 | 177 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object  | 
                                                        
| 178 | 178 | */  | 
                                                        
| 179 | - protected function addMailer( \Aimeos\MShop\Context\Item\Iface $context )  | 
                                                        |
| 179 | + protected function addMailer(\Aimeos\MShop\Context\Item\Iface $context)  | 
                                                        |
| 180 | 180 |  	{ | 
                                                        
| 181 | -		$mail = new \Aimeos\MW\Mail\Swift( function() { return app( 'mailer' )->getSwiftMailer(); } ); | 
                                                        |
| 182 | - $context->setMail( $mail );  | 
                                                        |
| 181 | +		$mail = new \Aimeos\MW\Mail\Swift(function() { return app('mailer')->getSwiftMailer(); } ); | 
                                                        |
| 182 | + $context->setMail($mail);  | 
                                                        |
| 183 | 183 | |
| 184 | 184 | return $context;  | 
                                                        
| 185 | 185 | }  | 
                                                        
@@ -191,10 +191,10 @@ discard block  | 
                                                    ||
| 191 | 191 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object  | 
                                                        
| 192 | 192 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object  | 
                                                        
| 193 | 193 | */  | 
                                                        
| 194 | - protected function addMessageQueueManager( \Aimeos\MShop\Context\Item\Iface $context )  | 
                                                        |
| 194 | + protected function addMessageQueueManager(\Aimeos\MShop\Context\Item\Iface $context)  | 
                                                        |
| 195 | 195 |  	{ | 
                                                        
| 196 | - $mq = new \Aimeos\MW\MQueue\Manager\Standard( $context->getConfig() );  | 
                                                        |
| 197 | - $context->setMessageQueueManager( $mq );  | 
                                                        |
| 196 | + $mq = new \Aimeos\MW\MQueue\Manager\Standard($context->getConfig());  | 
                                                        |
| 197 | + $context->setMessageQueueManager($mq);  | 
                                                        |
| 198 | 198 | |
| 199 | 199 | return $context;  | 
                                                        
| 200 | 200 | }  | 
                                                        
@@ -206,10 +206,10 @@ discard block  | 
                                                    ||
| 206 | 206 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object  | 
                                                        
| 207 | 207 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object  | 
                                                        
| 208 | 208 | */  | 
                                                        
| 209 | - protected function addSession( \Aimeos\MShop\Context\Item\Iface $context )  | 
                                                        |
| 209 | + protected function addSession(\Aimeos\MShop\Context\Item\Iface $context)  | 
                                                        |
| 210 | 210 |  	{ | 
                                                        
| 211 | - $session = new \Aimeos\MW\Session\Laravel5( $this->session );  | 
                                                        |
| 212 | - $context->setSession( $session );  | 
                                                        |
| 211 | + $session = new \Aimeos\MW\Session\Laravel5($this->session);  | 
                                                        |
| 212 | + $context->setSession($session);  | 
                                                        |
| 213 | 213 | |
| 214 | 214 | return $context;  | 
                                                        
| 215 | 215 | }  | 
                                                        
@@ -221,14 +221,14 @@ discard block  | 
                                                    ||
| 221 | 221 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object  | 
                                                        
| 222 | 222 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object  | 
                                                        
| 223 | 223 | */  | 
                                                        
| 224 | - protected function addUser( \Aimeos\MShop\Context\Item\Iface $context )  | 
                                                        |
| 224 | + protected function addUser(\Aimeos\MShop\Context\Item\Iface $context)  | 
                                                        |
| 225 | 225 |  	{ | 
                                                        
| 226 | -		if( ( $userid = Auth::id() ) !== null ) { | 
                                                        |
| 227 | - $context->setUserId( $userid );  | 
                                                        |
| 226 | +		if (($userid = Auth::id()) !== null) { | 
                                                        |
| 227 | + $context->setUserId($userid);  | 
                                                        |
| 228 | 228 | }  | 
                                                        
| 229 | 229 | |
| 230 | -		if( ( $user = Auth::user() ) !== null ) { | 
                                                        |
| 231 | - $context->setEditor( $user->name );  | 
                                                        |
| 230 | +		if (($user = Auth::user()) !== null) { | 
                                                        |
| 231 | + $context->setEditor($user->name);  | 
                                                        |
| 232 | 232 | }  | 
                                                        
| 233 | 233 | |
| 234 | 234 | return $context;  | 
                                                        
@@ -241,14 +241,14 @@ discard block  | 
                                                    ||
| 241 | 241 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object  | 
                                                        
| 242 | 242 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object  | 
                                                        
| 243 | 243 | */  | 
                                                        
| 244 | - protected function addGroups( \Aimeos\MShop\Context\Item\Iface $context )  | 
                                                        |
| 244 | + protected function addGroups(\Aimeos\MShop\Context\Item\Iface $context)  | 
                                                        |
| 245 | 245 |  	{ | 
                                                        
| 246 | - if( ( $userid = Auth::id() ) !== null )  | 
                                                        |
| 246 | + if (($userid = Auth::id()) !== null)  | 
                                                        |
| 247 | 247 |  		{ | 
                                                        
| 248 | - $context->setGroupIds( function() use ( $context, $userid )  | 
                                                        |
| 248 | + $context->setGroupIds(function() use ($context, $userid)  | 
                                                        |
| 249 | 249 |  			{ | 
                                                        
| 250 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );  | 
                                                        |
| 251 | - return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups();  | 
                                                        |
| 250 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer');  | 
                                                        |
| 251 | +				return $manager->getItem($userid, array('customer/group'))->getGroups(); | 
                                                        |
| 252 | 252 | } );  | 
                                                        
| 253 | 253 | }  | 
                                                        
| 254 | 254 | |
@@ -40,7 +40,7 @@ discard block  | 
                                                    ||
| 40 | 40 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object  | 
                                                        
| 41 | 41 | * @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object  | 
                                                        
| 42 | 42 | */  | 
                                                        
| 43 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos )  | 
                                                        |
| 43 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos)  | 
                                                        |
| 44 | 44 |  	{ | 
                                                        
| 45 | 45 | $this->aimeos = $aimeos;  | 
                                                        
| 46 | 46 | $this->config = $config;  | 
                                                        
@@ -53,22 +53,22 @@ discard block  | 
                                                    ||
| 53 | 53 | * @param array $languageIds List of two letter ISO language IDs  | 
                                                        
| 54 | 54 | * @return \Aimeos\MW\Translation\Iface[] List of translation objects  | 
                                                        
| 55 | 55 | */  | 
                                                        
| 56 | - public function get( array $languageIds )  | 
                                                        |
| 56 | + public function get(array $languageIds)  | 
                                                        |
| 57 | 57 |  	{ | 
                                                        
| 58 | 58 | $i18nPaths = $this->aimeos->get()->getI18nPaths();  | 
                                                        
| 59 | 59 | |
| 60 | - foreach( $languageIds as $langid )  | 
                                                        |
| 60 | + foreach ($languageIds as $langid)  | 
                                                        |
| 61 | 61 |  		{ | 
                                                        
| 62 | - if( !isset( $this->i18n[$langid] ) )  | 
                                                        |
| 62 | + if (!isset($this->i18n[$langid]))  | 
                                                        |
| 63 | 63 |  			{ | 
                                                        
| 64 | - $i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $langid );  | 
                                                        |
| 64 | + $i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $langid);  | 
                                                        |
| 65 | 65 | |
| 66 | -				if( function_exists( 'apc_store' ) === true && $this->config->get( 'shop.apc_enabled', false ) == true ) { | 
                                                        |
| 67 | - $i18n = new \Aimeos\MW\Translation\Decorator\APC( $i18n, $this->config->get( 'shop.apc_prefix', 'laravel:' ) );  | 
                                                        |
| 66 | +				if (function_exists('apc_store') === true && $this->config->get('shop.apc_enabled', false) == true) { | 
                                                        |
| 67 | +					$i18n = new \Aimeos\MW\Translation\Decorator\APC($i18n, $this->config->get('shop.apc_prefix', 'laravel:')); | 
                                                        |
| 68 | 68 | }  | 
                                                        
| 69 | 69 | |
| 70 | -				if( $this->config->has( 'shop.i18n.' . $langid ) ) { | 
                                                        |
| 71 | - $i18n = new \Aimeos\MW\Translation\Decorator\Memory( $i18n, $this->config->get( 'shop.i18n.' . $langid ) );  | 
                                                        |
| 70 | +				if ($this->config->has('shop.i18n.'.$langid)) { | 
                                                        |
| 71 | +					$i18n = new \Aimeos\MW\Translation\Decorator\Memory($i18n, $this->config->get('shop.i18n.'.$langid)); | 
                                                        |
| 72 | 72 | }  | 
                                                        
| 73 | 73 | |
| 74 | 74 | $this->i18n[$langid] = $i18n;  | 
                                                        
@@ -39,7 +39,7 @@ discard block  | 
                                                    ||
| 39 | 39 | * @param \Aimeos\Shop\Base\Context $context Context provider  | 
                                                        
| 40 | 40 | * @param \Aimeos\Shop\Base\Locale $locale Locale provider  | 
                                                        
| 41 | 41 | */  | 
                                                        
| 42 | - public function __construct( \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale )  | 
                                                        |
| 42 | + public function __construct(\Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale)  | 
                                                        |
| 43 | 43 |  	{ | 
                                                        
| 44 | 44 | $this->context = $context;  | 
                                                        
| 45 | 45 | $this->locale = $locale;  | 
                                                        
@@ -53,45 +53,45 @@ discard block  | 
                                                    ||
| 53 | 53 | * @param string|array $groupcodes Unique user/customer group codes that are allowed  | 
                                                        
| 54 | 54 | * @return boolean True if user is part of the group, false if not  | 
                                                        
| 55 | 55 | */  | 
                                                        
| 56 | - public function checkGroup( $userid, $groupcodes )  | 
                                                        |
| 56 | + public function checkGroup($userid, $groupcodes)  | 
                                                        |
| 57 | 57 |  	{ | 
                                                        
| 58 | - $site = ( Route::current() ? Route::input( 'site', Input::get( 'site', 'default' ) ) : 'default' );  | 
                                                        |
| 58 | +		$site = (Route::current() ? Route::input('site', Input::get('site', 'default')) : 'default'); | 
                                                        |
| 59 | 59 | |
| 60 | - $context = $this->context->get( false );  | 
                                                        |
| 61 | - $context->setLocale( $this->locale->getBackend( $context, $site ) );  | 
                                                        |
| 60 | + $context = $this->context->get(false);  | 
                                                        |
| 61 | + $context->setLocale($this->locale->getBackend($context, $site));  | 
                                                        |
| 62 | 62 | |
| 63 | 63 | |
| 64 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' );  | 
                                                        |
| 64 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group');  | 
                                                        |
| 65 | 65 | |
| 66 | 66 | $search = $manager->createSearch();  | 
                                                        
| 67 | - $search->setConditions( $search->compare( '==', 'customer.group.code', (array) $groupcodes ) );  | 
                                                        |
| 68 | - $groupItems = $manager->searchItems( $search );  | 
                                                        |
| 67 | +		$search->setConditions($search->compare('==', 'customer.group.code', (array) $groupcodes)); | 
                                                        |
| 68 | + $groupItems = $manager->searchItems($search);  | 
                                                        |
| 69 | 69 | |
| 70 | 70 | |
| 71 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );  | 
                                                        |
| 71 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');  | 
                                                        |
| 72 | 72 | |
| 73 | 73 | $search = $manager->createSearch();  | 
                                                        
| 74 | 74 | $expr = array(  | 
                                                        
| 75 | - $search->compare( '==', 'customer.lists.parentid', $userid ),  | 
                                                        |
| 76 | - $search->compare( '==', 'customer.lists.refid', array_keys( $groupItems ) ),  | 
                                                        |
| 77 | - $search->compare( '==', 'customer.lists.domain', 'customer/group' ),  | 
                                                        |
| 75 | +			$search->compare('==', 'customer.lists.parentid', $userid), | 
                                                        |
| 76 | +			$search->compare('==', 'customer.lists.refid', array_keys($groupItems)), | 
                                                        |
| 77 | +			$search->compare('==', 'customer.lists.domain', 'customer/group'), | 
                                                        |
| 78 | 78 | );  | 
                                                        
| 79 | - $search->setConditions( $search->combine( '&&', $expr ) );  | 
                                                        |
| 80 | - $search->setSlice( 0, 1 );  | 
                                                        |
| 79 | +		$search->setConditions($search->combine('&&', $expr)); | 
                                                        |
| 80 | + $search->setSlice(0, 1);  | 
                                                        |
| 81 | 81 | |
| 82 | - return (bool) count( $manager->searchItems( $search ) );  | 
                                                        |
| 82 | + return (bool) count($manager->searchItems($search));  | 
                                                        |
| 83 | 83 | }  | 
                                                        
| 84 | 84 | |
| 85 | 85 | |
| 86 | - public function getGroups( \Aimeos\MShop\Context\Item\Iface $context )  | 
                                                        |
| 86 | + public function getGroups(\Aimeos\MShop\Context\Item\Iface $context)  | 
                                                        |
| 87 | 87 |  	{ | 
                                                        
| 88 | 88 | $list = array();  | 
                                                        
| 89 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' );  | 
                                                        |
| 89 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group');  | 
                                                        |
| 90 | 90 | |
| 91 | 91 | $search = $manager->createSearch();  | 
                                                        
| 92 | - $search->setConditions( $search->compare( '==', 'customer.group.id', $context->getGroupIds() ) );  | 
                                                        |
| 92 | +		$search->setConditions($search->compare('==', 'customer.group.id', $context->getGroupIds())); | 
                                                        |
| 93 | 93 | |
| 94 | -		foreach( $manager->searchItems( $search ) as $item ) { | 
                                                        |
| 94 | +		foreach ($manager->searchItems($search) as $item) { | 
                                                        |
| 95 | 95 | $list[] = $item->getCode();  | 
                                                        
| 96 | 96 | }  | 
                                                        
| 97 | 97 | |
@@ -43,29 +43,29 @@ discard block  | 
                                                    ||
| 43 | 43 | */  | 
                                                        
| 44 | 44 | public function fire()  | 
                                                        
| 45 | 45 |  	{ | 
                                                        
| 46 | - $code = $this->argument( 'email' );  | 
                                                        |
| 47 | -		if( ( $password = $this->option( 'password' ) ) === null ) { | 
                                                        |
| 48 | - $password = $this->secret( 'Password' );  | 
                                                        |
| 46 | +		$code = $this->argument('email'); | 
                                                        |
| 47 | +		if (($password = $this->option('password')) === null) { | 
                                                        |
| 48 | +			$password = $this->secret('Password'); | 
                                                        |
| 49 | 49 | }  | 
                                                        
| 50 | 50 | |
| 51 | - $context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false, 'command' );  | 
                                                        |
| 52 | - $context->setEditor( 'aimeos:account' );  | 
                                                        |
| 51 | +		$context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false, 'command'); | 
                                                        |
| 52 | +		$context->setEditor('aimeos:account'); | 
                                                        |
| 53 | 53 | |
| 54 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );  | 
                                                        |
| 55 | - $context->setLocale( $localeManager->createItem() );  | 
                                                        |
| 54 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);  | 
                                                        |
| 55 | + $context->setLocale($localeManager->createItem());  | 
                                                        |
| 56 | 56 | |
| 57 | - $user = $this->createCustomerItem( $context, $code, $password );  | 
                                                        |
| 57 | + $user = $this->createCustomerItem($context, $code, $password);  | 
                                                        |
| 58 | 58 | |
| 59 | -		if( $this->option( 'admin' ) ) { | 
                                                        |
| 60 | - $this->addGroup( $context, $user, 'admin' );  | 
                                                        |
| 59 | +		if ($this->option('admin')) { | 
                                                        |
| 60 | + $this->addGroup($context, $user, 'admin');  | 
                                                        |
| 61 | 61 | }  | 
                                                        
| 62 | 62 | |
| 63 | -		if( $this->option( 'api' ) ) { | 
                                                        |
| 64 | - $this->addGroup( $context, $user, 'api' );  | 
                                                        |
| 63 | +		if ($this->option('api')) { | 
                                                        |
| 64 | + $this->addGroup($context, $user, 'api');  | 
                                                        |
| 65 | 65 | }  | 
                                                        
| 66 | 66 | |
| 67 | -		if( $this->option( 'editor' ) ) { | 
                                                        |
| 68 | - $this->addGroup( $context, $user, 'editor' );  | 
                                                        |
| 67 | +		if ($this->option('editor')) { | 
                                                        |
| 68 | + $this->addGroup($context, $user, 'editor');  | 
                                                        |
| 69 | 69 | }  | 
                                                        
| 70 | 70 | }  | 
                                                        
| 71 | 71 | |
@@ -77,33 +77,33 @@ discard block  | 
                                                    ||
| 77 | 77 | * @param string $userid Unique user ID  | 
                                                        
| 78 | 78 | * @param string $groupid Unique group ID  | 
                                                        
| 79 | 79 | */  | 
                                                        
| 80 | - protected function addListItem( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid )  | 
                                                        |
| 80 | + protected function addListItem(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid)  | 
                                                        |
| 81 | 81 |  	{ | 
                                                        
| 82 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );  | 
                                                        |
| 83 | - $typeManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists/type' );  | 
                                                        |
| 82 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');  | 
                                                        |
| 83 | + $typeManager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists/type');  | 
                                                        |
| 84 | 84 | |
| 85 | - $typeid = $typeManager->findItem( 'default', array(), 'customer/group' )->getId();  | 
                                                        |
| 85 | +		$typeid = $typeManager->findItem('default', array(), 'customer/group')->getId(); | 
                                                        |
| 86 | 86 | |
| 87 | 87 | $search = $manager->createSearch();  | 
                                                        
| 88 | 88 | $expr = array(  | 
                                                        
| 89 | - $search->compare( '==', 'customer.lists.parentid', $userid ),  | 
                                                        |
| 90 | - $search->compare( '==', 'customer.lists.refid', $groupid ),  | 
                                                        |
| 91 | - $search->compare( '==', 'customer.lists.domain', 'customer/group' ),  | 
                                                        |
| 92 | - $search->compare( '==', 'customer.lists.typeid', $typeid ),  | 
                                                        |
| 89 | +			$search->compare('==', 'customer.lists.parentid', $userid), | 
                                                        |
| 90 | +			$search->compare('==', 'customer.lists.refid', $groupid), | 
                                                        |
| 91 | +			$search->compare('==', 'customer.lists.domain', 'customer/group'), | 
                                                        |
| 92 | +			$search->compare('==', 'customer.lists.typeid', $typeid), | 
                                                        |
| 93 | 93 | );  | 
                                                        
| 94 | - $search->setConditions( $search->combine( '&&', $expr ) );  | 
                                                        |
| 95 | - $search->setSlice( 0, 1 );  | 
                                                        |
| 94 | +		$search->setConditions($search->combine('&&', $expr)); | 
                                                        |
| 95 | + $search->setSlice(0, 1);  | 
                                                        |
| 96 | 96 | |
| 97 | - if( count( $manager->searchItems( $search ) ) === 0 )  | 
                                                        |
| 97 | + if (count($manager->searchItems($search)) === 0)  | 
                                                        |
| 98 | 98 |  		{ | 
                                                        
| 99 | 99 | $item = $manager->createItem();  | 
                                                        
| 100 | - $item->setDomain( 'customer/group' );  | 
                                                        |
| 101 | - $item->setParentId( $userid );  | 
                                                        |
| 102 | - $item->setTypeId( $typeid );  | 
                                                        |
| 103 | - $item->setRefId( $groupid );  | 
                                                        |
| 104 | - $item->setStatus( 1 );  | 
                                                        |
| 100 | +			$item->setDomain('customer/group'); | 
                                                        |
| 101 | + $item->setParentId($userid);  | 
                                                        |
| 102 | + $item->setTypeId($typeid);  | 
                                                        |
| 103 | + $item->setRefId($groupid);  | 
                                                        |
| 104 | + $item->setStatus(1);  | 
                                                        |
| 105 | 105 | |
| 106 | - $manager->saveItem( $item, false );  | 
                                                        |
| 106 | + $manager->saveItem($item, false);  | 
                                                        |
| 107 | 107 | }  | 
                                                        
| 108 | 108 | }  | 
                                                        
| 109 | 109 | |
@@ -115,23 +115,23 @@ discard block  | 
                                                    ||
| 115 | 115 | * @param \Aimeos\MShop\Customer\Item\Iface $user Aimeos customer object  | 
                                                        
| 116 | 116 | * @param string $group Unique customer group code  | 
                                                        
| 117 | 117 | */  | 
                                                        
| 118 | - protected function addGroup( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group )  | 
                                                        |
| 118 | + protected function addGroup(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group)  | 
                                                        |
| 119 | 119 |  	{ | 
                                                        
| 120 | - $this->info( sprintf( 'Add "%1$s" group to user "%2$s" for sites', $group, $user->getCode() ) );  | 
                                                        |
| 120 | +		$this->info(sprintf('Add "%1$s" group to user "%2$s" for sites', $group, $user->getCode())); | 
                                                        |
| 121 | 121 | |
| 122 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );  | 
                                                        |
| 122 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);  | 
                                                        |
| 123 | 123 | |
| 124 | - foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem )  | 
                                                        |
| 124 | +		foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem) | 
                                                        |
| 125 | 125 |  		{ | 
                                                        
| 126 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );  | 
                                                        |
| 126 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);  | 
                                                        |
| 127 | 127 | |
| 128 | 128 | $lcontext = clone $context;  | 
                                                        
| 129 | - $lcontext->setLocale( $localeItem );  | 
                                                        |
| 129 | + $lcontext->setLocale($localeItem);  | 
                                                        |
| 130 | 130 | |
| 131 | - $this->info( '- ' . $siteItem->getCode() );  | 
                                                        |
| 131 | +			$this->info('- '.$siteItem->getCode()); | 
                                                        |
| 132 | 132 | |
| 133 | - $groupItem = $this->getGroupItem( $lcontext, $group );  | 
                                                        |
| 134 | - $this->addListItem( $lcontext, $user->getId(), $groupItem->getId() );  | 
                                                        |
| 133 | + $groupItem = $this->getGroupItem($lcontext, $group);  | 
                                                        |
| 134 | + $this->addListItem($lcontext, $user->getId(), $groupItem->getId());  | 
                                                        |
| 135 | 135 | }  | 
                                                        
| 136 | 136 | }  | 
                                                        
| 137 | 137 | |
@@ -146,23 +146,23 @@ discard block  | 
                                                    ||
| 146 | 146 | * @param string $password New user password  | 
                                                        
| 147 | 147 | * @return \Aimeos\MShop\Customer\Item\Iface Aimeos customer item object  | 
                                                        
| 148 | 148 | */  | 
                                                        
| 149 | - protected function createCustomerItem( \Aimeos\MShop\Context\Item\Iface $context, $email, $password )  | 
                                                        |
| 149 | + protected function createCustomerItem(\Aimeos\MShop\Context\Item\Iface $context, $email, $password)  | 
                                                        |
| 150 | 150 |  	{ | 
                                                        
| 151 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );  | 
                                                        |
| 151 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer');  | 
                                                        |
| 152 | 152 | |
| 153 | 153 |  		try { | 
                                                        
| 154 | - $item = $manager->findItem( $email );  | 
                                                        |
| 155 | -		} catch( \Aimeos\MShop\Exception $e ) { | 
                                                        |
| 154 | + $item = $manager->findItem($email);  | 
                                                        |
| 155 | +		} catch (\Aimeos\MShop\Exception $e) { | 
                                                        |
| 156 | 156 | $item = $manager->createItem();  | 
                                                        
| 157 | 157 | }  | 
                                                        
| 158 | 158 | |
| 159 | - $item->setCode( $email );  | 
                                                        |
| 160 | - $item->setLabel( $email );  | 
                                                        |
| 161 | - $item->getPaymentAddress()->setEmail( $email );  | 
                                                        |
| 162 | - $item->setPassword( $password );  | 
                                                        |
| 163 | - $item->setStatus( 1 );  | 
                                                        |
| 159 | + $item->setCode($email);  | 
                                                        |
| 160 | + $item->setLabel($email);  | 
                                                        |
| 161 | + $item->getPaymentAddress()->setEmail($email);  | 
                                                        |
| 162 | + $item->setPassword($password);  | 
                                                        |
| 163 | + $item->setStatus(1);  | 
                                                        |
| 164 | 164 | |
| 165 | - $manager->saveItem( $item );  | 
                                                        |
| 165 | + $manager->saveItem($item);  | 
                                                        |
| 166 | 166 | |
| 167 | 167 | return $item;  | 
                                                        
| 168 | 168 | }  | 
                                                        
@@ -176,8 +176,8 @@ discard block  | 
                                                    ||
| 176 | 176 | protected function getArguments()  | 
                                                        
| 177 | 177 |  	{ | 
                                                        
| 178 | 178 | return array(  | 
                                                        
| 179 | - array( 'email', InputArgument::REQUIRED, 'E-mail address of the account that should be created' ),  | 
                                                        |
| 180 | - array( 'site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default unittest" (none for all)' ),  | 
                                                        |
| 179 | +			array('email', InputArgument::REQUIRED, 'E-mail address of the account that should be created'), | 
                                                        |
| 180 | +			array('site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default unittest" (none for all)'), | 
                                                        |
| 181 | 181 | );  | 
                                                        
| 182 | 182 | }  | 
                                                        
| 183 | 183 | |
@@ -189,21 +189,21 @@ discard block  | 
                                                    ||
| 189 | 189 | * @param string $code Unique customer group code  | 
                                                        
| 190 | 190 | * @return \Aimeos\MShop\Customer\Item\Group\Iface Aimeos customer group item object  | 
                                                        
| 191 | 191 | */  | 
                                                        
| 192 | - protected function getGroupItem( \Aimeos\MShop\Context\Item\Iface $context, $code )  | 
                                                        |
| 192 | + protected function getGroupItem(\Aimeos\MShop\Context\Item\Iface $context, $code)  | 
                                                        |
| 193 | 193 |  	{ | 
                                                        
| 194 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'group' );  | 
                                                        |
| 194 | +		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('group'); | 
                                                        |
| 195 | 195 | |
| 196 | 196 | try  | 
                                                        
| 197 | 197 |  		{ | 
                                                        
| 198 | - $item = $manager->findItem( $code );  | 
                                                        |
| 198 | + $item = $manager->findItem($code);  | 
                                                        |
| 199 | 199 | }  | 
                                                        
| 200 | - catch( \Aimeos\MShop\Exception $e )  | 
                                                        |
| 200 | + catch (\Aimeos\MShop\Exception $e)  | 
                                                        |
| 201 | 201 |  		{ | 
                                                        
| 202 | 202 | $item = $manager->createItem();  | 
                                                        
| 203 | - $item->setLabel( $code );  | 
                                                        |
| 204 | - $item->setCode( $code );  | 
                                                        |
| 203 | + $item->setLabel($code);  | 
                                                        |
| 204 | + $item->setCode($code);  | 
                                                        |
| 205 | 205 | |
| 206 | - $manager->saveItem( $item );  | 
                                                        |
| 206 | + $manager->saveItem($item);  | 
                                                        |
| 207 | 207 | }  | 
                                                        
| 208 | 208 | |
| 209 | 209 | return $item;  | 
                                                        
@@ -218,10 +218,10 @@ discard block  | 
                                                    ||
| 218 | 218 | protected function getOptions()  | 
                                                        
| 219 | 219 |  	{ | 
                                                        
| 220 | 220 | return array(  | 
                                                        
| 221 | - array( 'password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)' ),  | 
                                                        |
| 222 | - array( 'admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges' ),  | 
                                                        |
| 223 | - array( 'api', null, InputOption::VALUE_NONE, 'If account should be able to access the APIs' ),  | 
                                                        |
| 224 | - array( 'editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges' ),  | 
                                                        |
| 221 | +			array('password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)'), | 
                                                        |
| 222 | +			array('admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges'), | 
                                                        |
| 223 | +			array('api', null, InputOption::VALUE_NONE, 'If account should be able to access the APIs'), | 
                                                        |
| 224 | +			array('editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges'), | 
                                                        |
| 225 | 225 | );  | 
                                                        
| 226 | 226 | }  | 
                                                        
| 227 | 227 | }  | 
                                                        
@@ -196,8 +196,7 @@  | 
                                                    ||
| 196 | 196 | try  | 
                                                        
| 197 | 197 |  		{ | 
                                                        
| 198 | 198 | $item = $manager->findItem( $code );  | 
                                                        
| 199 | - }  | 
                                                        |
| 200 | - catch( \Aimeos\MShop\Exception $e )  | 
                                                        |
| 199 | + } catch( \Aimeos\MShop\Exception $e )  | 
                                                        |
| 201 | 200 |  		{ | 
                                                        
| 202 | 201 | $item = $manager->createItem();  | 
                                                        
| 203 | 202 | $item->setLabel( $code );  | 
                                                        
@@ -43,24 +43,24 @@ discard block  | 
                                                    ||
| 43 | 43 | */  | 
                                                        
| 44 | 44 | public function fire()  | 
                                                        
| 45 | 45 |  	{ | 
                                                        
| 46 | - $aimeos = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get();  | 
                                                        |
| 46 | +		$aimeos = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get(); | 
                                                        |
| 47 | 47 | $context = $this->getContext();  | 
                                                        
| 48 | 48 | |
| 49 | - $jobs = explode( ' ', $this->argument( 'jobs' ) );  | 
                                                        |
| 50 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );  | 
                                                        |
| 49 | +		$jobs = explode(' ', $this->argument('jobs')); | 
                                                        |
| 50 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);  | 
                                                        |
| 51 | 51 | |
| 52 | - foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem )  | 
                                                        |
| 52 | +		foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem) | 
                                                        |
| 53 | 53 |  		{ | 
                                                        
| 54 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );  | 
                                                        |
| 55 | - $localeItem->setLanguageId( null );  | 
                                                        |
| 56 | - $localeItem->setCurrencyId( null );  | 
                                                        |
| 54 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);  | 
                                                        |
| 55 | + $localeItem->setLanguageId(null);  | 
                                                        |
| 56 | + $localeItem->setCurrencyId(null);  | 
                                                        |
| 57 | 57 | |
| 58 | - $context->setLocale( $localeItem );  | 
                                                        |
| 58 | + $context->setLocale($localeItem);  | 
                                                        |
| 59 | 59 | |
| 60 | - $this->info( sprintf( 'Executing the Aimeos jobs for "%s"', $siteItem->getCode() ) );  | 
                                                        |
| 60 | +			$this->info(sprintf('Executing the Aimeos jobs for "%s"', $siteItem->getCode())); | 
                                                        |
| 61 | 61 | |
| 62 | -			foreach( $jobs as $jobname ) { | 
                                                        |
| 63 | - \Aimeos\Controller\Jobs\Factory::createController( $context, $aimeos, $jobname )->run();  | 
                                                        |
| 62 | +			foreach ($jobs as $jobname) { | 
                                                        |
| 63 | + \Aimeos\Controller\Jobs\Factory::createController($context, $aimeos, $jobname)->run();  | 
                                                        |
| 64 | 64 | }  | 
                                                        
| 65 | 65 | }  | 
                                                        
| 66 | 66 | }  | 
                                                        
@@ -74,8 +74,8 @@ discard block  | 
                                                    ||
| 74 | 74 | protected function getArguments()  | 
                                                        
| 75 | 75 |  	{ | 
                                                        
| 76 | 76 | return array(  | 
                                                        
| 77 | - array( 'jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"' ),  | 
                                                        |
| 78 | - array( 'site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)' ),  | 
                                                        |
| 77 | +			array('jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"'), | 
                                                        |
| 78 | +			array('site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)'), | 
                                                        |
| 79 | 79 | );  | 
                                                        
| 80 | 80 | }  | 
                                                        
| 81 | 81 | |
@@ -98,19 +98,19 @@ discard block  | 
                                                    ||
| 98 | 98 | protected function getContext()  | 
                                                        
| 99 | 99 |  	{ | 
                                                        
| 100 | 100 | $lv = $this->getLaravel();  | 
                                                        
| 101 | - $aimeos = $lv->make( '\Aimeos\Shop\Base\Aimeos' )->get();  | 
                                                        |
| 102 | - $context = $lv->make( '\Aimeos\Shop\Base\Context' )->get( false, 'command' );  | 
                                                        |
| 101 | +		$aimeos = $lv->make('\Aimeos\Shop\Base\Aimeos')->get(); | 
                                                        |
| 102 | +		$context = $lv->make('\Aimeos\Shop\Base\Context')->get(false, 'command'); | 
                                                        |
| 103 | 103 | |
| 104 | - $tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' );  | 
                                                        |
| 105 | - $view = $lv->make( '\Aimeos\Shop\Base\View' )->create( $context, $tmplPaths );  | 
                                                        |
| 104 | +		$tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates'); | 
                                                        |
| 105 | +		$view = $lv->make('\Aimeos\Shop\Base\View')->create($context, $tmplPaths); | 
                                                        |
| 106 | 106 | |
| 107 | - $langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context )->getSubManager( 'language' );  | 
                                                        |
| 108 | - $langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) );  | 
                                                        |
| 109 | - $i18n = $lv->make( '\Aimeos\Shop\Base\I18n' )->get( $langids );  | 
                                                        |
| 107 | +		$langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context)->getSubManager('language'); | 
                                                        |
| 108 | + $langids = array_keys($langManager->searchItems($langManager->createSearch(true)));  | 
                                                        |
| 109 | +		$i18n = $lv->make('\Aimeos\Shop\Base\I18n')->get($langids); | 
                                                        |
| 110 | 110 | |
| 111 | - $context->setEditor( 'aimeos:jobs' );  | 
                                                        |
| 112 | - $context->setView( $view );  | 
                                                        |
| 113 | - $context->setI18n( $i18n );  | 
                                                        |
| 111 | +		$context->setEditor('aimeos:jobs'); | 
                                                        |
| 112 | + $context->setView($view);  | 
                                                        |
| 113 | + $context->setI18n($i18n);  | 
                                                        |
| 114 | 114 | |
| 115 | 115 | return $context;  | 
                                                        
| 116 | 116 | }  |