@@ -42,24 +42,24 @@ discard block  | 
                                                    ||
| 42 | 42 | */  | 
                                                        
| 43 | 43 | public function fire()  | 
                                                        
| 44 | 44 |  	{ | 
                                                        
| 45 | - $context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false, 'command' );  | 
                                                        |
| 46 | - $context->setEditor( 'aimeos:cache' );  | 
                                                        |
| 45 | +		$context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false, 'command'); | 
                                                        |
| 46 | +		$context->setEditor('aimeos:cache'); | 
                                                        |
| 47 | 47 | |
| 48 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );  | 
                                                        |
| 48 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);  | 
                                                        |
| 49 | 49 | |
| 50 | - foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem )  | 
                                                        |
| 50 | +		foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem) | 
                                                        |
| 51 | 51 |  		{ | 
                                                        
| 52 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );  | 
                                                        |
| 52 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);  | 
                                                        |
| 53 | 53 | |
| 54 | 54 | $lcontext = clone $context;  | 
                                                        
| 55 | - $lcontext->setLocale( $localeItem );  | 
                                                        |
| 55 | + $lcontext->setLocale($localeItem);  | 
                                                        |
| 56 | 56 | |
| 57 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext );  | 
                                                        |
| 58 | - $lcontext->setCache( $cache );  | 
                                                        |
| 57 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext);  | 
                                                        |
| 58 | + $lcontext->setCache($cache);  | 
                                                        |
| 59 | 59 | |
| 60 | - $this->info( sprintf( 'Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode() ) );  | 
                                                        |
| 60 | +			$this->info(sprintf('Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode())); | 
                                                        |
| 61 | 61 | |
| 62 | - \Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->flush();  | 
                                                        |
| 62 | + \Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->flush();  | 
                                                        |
| 63 | 63 | }  | 
                                                        
| 64 | 64 | }  | 
                                                        
| 65 | 65 | |
@@ -72,7 +72,7 @@ discard block  | 
                                                    ||
| 72 | 72 | protected function getArguments()  | 
                                                        
| 73 | 73 |  	{ | 
                                                        
| 74 | 74 | return array(  | 
                                                        
| 75 | - array( 'site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)' ),  | 
                                                        |
| 75 | +			array('site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)'), | 
                                                        |
| 76 | 76 | );  | 
                                                        
| 77 | 77 | }  | 
                                                        
| 78 | 78 | |
@@ -42,18 +42,18 @@ discard block  | 
                                                    ||
| 42 | 42 | * @param string $classname Name of the setup task class  | 
                                                        
| 43 | 43 | * @return boolean True if class is found, false if not  | 
                                                        
| 44 | 44 | */  | 
                                                        
| 45 | - public static function autoload( $classname )  | 
                                                        |
| 45 | + public static function autoload($classname)  | 
                                                        |
| 46 | 46 |  	{ | 
                                                        
| 47 | - if( strncmp( $classname, 'Aimeos\\MW\\Setup\\Task\\', 21 ) === 0 )  | 
                                                        |
| 47 | + if (strncmp($classname, 'Aimeos\\MW\\Setup\\Task\\', 21) === 0)  | 
                                                        |
| 48 | 48 |  		{ | 
                                                        
| 49 | - $fileName = substr( $classname, 21 ) . '.php';  | 
                                                        |
| 50 | - $paths = explode( PATH_SEPARATOR, get_include_path() );  | 
                                                        |
| 49 | + $fileName = substr($classname, 21).'.php';  | 
                                                        |
| 50 | + $paths = explode(PATH_SEPARATOR, get_include_path());  | 
                                                        |
| 51 | 51 | |
| 52 | - foreach( $paths as $path )  | 
                                                        |
| 52 | + foreach ($paths as $path)  | 
                                                        |
| 53 | 53 |  			{ | 
                                                        
| 54 | - $file = $path . DIRECTORY_SEPARATOR . $fileName;  | 
                                                        |
| 54 | + $file = $path.DIRECTORY_SEPARATOR.$fileName;  | 
                                                        |
| 55 | 55 | |
| 56 | -				if( file_exists( $file ) === true && ( include_once $file ) !== false ) { | 
                                                        |
| 56 | +				if (file_exists($file) === true && (include_once $file) !== false) { | 
                                                        |
| 57 | 57 | return true;  | 
                                                        
| 58 | 58 | }  | 
                                                        
| 59 | 59 | }  | 
                                                        
@@ -70,49 +70,49 @@ discard block  | 
                                                    ||
| 70 | 70 | */  | 
                                                        
| 71 | 71 | public function fire()  | 
                                                        
| 72 | 72 |  	{ | 
                                                        
| 73 | - $ctx = $this->getLaravel()->make( '\Aimeos\Shop\Base\Context' )->get( false, 'command' );  | 
                                                        |
| 74 | - $ctx->setEditor( 'aimeos:setup' );  | 
                                                        |
| 73 | +		$ctx = $this->getLaravel()->make('\Aimeos\Shop\Base\Context')->get(false, 'command'); | 
                                                        |
| 74 | +		$ctx->setEditor('aimeos:setup'); | 
                                                        |
| 75 | 75 | |
| 76 | 76 | $config = $ctx->getConfig();  | 
                                                        
| 77 | - $site = $this->argument( 'site' );  | 
                                                        |
| 78 | - $template = $this->argument( 'tplsite' );  | 
                                                        |
| 77 | +		$site = $this->argument('site'); | 
                                                        |
| 78 | +		$template = $this->argument('tplsite'); | 
                                                        |
| 79 | 79 | |
| 80 | - $config->set( 'setup/site', $site );  | 
                                                        |
| 81 | - $dbconfig = $this->getDbConfig( $config );  | 
                                                        |
| 82 | - $this->setOptions( $config );  | 
                                                        |
| 80 | +		$config->set('setup/site', $site); | 
                                                        |
| 81 | + $dbconfig = $this->getDbConfig($config);  | 
                                                        |
| 82 | + $this->setOptions($config);  | 
                                                        |
| 83 | 83 | |
| 84 | - $taskPaths = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get()->getSetupPaths( $template );  | 
                                                        |
| 84 | +		$taskPaths = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get()->getSetupPaths($template); | 
                                                        |
| 85 | 85 | |
| 86 | 86 | $includePaths = $taskPaths;  | 
                                                        
| 87 | 87 | $includePaths[] = get_include_path();  | 
                                                        
| 88 | 88 | |
| 89 | -		if( set_include_path( implode( PATH_SEPARATOR, $includePaths ) ) === false ) { | 
                                                        |
| 90 | - throw new \Exception( 'Unable to extend include path' );  | 
                                                        |
| 89 | +		if (set_include_path(implode(PATH_SEPARATOR, $includePaths)) === false) { | 
                                                        |
| 90 | +			throw new \Exception('Unable to extend include path'); | 
                                                        |
| 91 | 91 | }  | 
                                                        
| 92 | 92 | |
| 93 | - spl_autoload_register( '\Aimeos\Shop\Command\SetupCommand::autoload', true );  | 
                                                        |
| 93 | +		spl_autoload_register('\Aimeos\Shop\Command\SetupCommand::autoload', true); | 
                                                        |
| 94 | 94 | |
| 95 | - $manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx );  | 
                                                        |
| 95 | + $manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx);  | 
                                                        |
| 96 | 96 | |
| 97 | - $this->info( sprintf( 'Initializing or updating the Aimeos database tables for site "%1$s"', $site ) );  | 
                                                        |
| 97 | +		$this->info(sprintf('Initializing or updating the Aimeos database tables for site "%1$s"', $site)); | 
                                                        |
| 98 | 98 | |
| 99 | -		if( ( $task = $this->option( 'task' ) ) && is_array( $task ) ) { | 
                                                        |
| 100 | - $task = reset( $task );  | 
                                                        |
| 99 | +		if (($task = $this->option('task')) && is_array($task)) { | 
                                                        |
| 100 | + $task = reset($task);  | 
                                                        |
| 101 | 101 | }  | 
                                                        
| 102 | 102 | |
| 103 | - switch( $this->option( 'action' ) )  | 
                                                        |
| 103 | +		switch ($this->option('action')) | 
                                                        |
| 104 | 104 |  		{ | 
                                                        
| 105 | 105 | case 'migrate':  | 
                                                        
| 106 | - $manager->migrate( $task );  | 
                                                        |
| 106 | + $manager->migrate($task);  | 
                                                        |
| 107 | 107 | break;  | 
                                                        
| 108 | 108 | case 'rollback':  | 
                                                        
| 109 | - $manager->rollback( $task );  | 
                                                        |
| 109 | + $manager->rollback($task);  | 
                                                        |
| 110 | 110 | break;  | 
                                                        
| 111 | 111 | case 'clean':  | 
                                                        
| 112 | - $manager->clean( $task );  | 
                                                        |
| 112 | + $manager->clean($task);  | 
                                                        |
| 113 | 113 | break;  | 
                                                        
| 114 | 114 | default:  | 
                                                        
| 115 | - throw new \Exception( sprintf( 'Invalid setup action "%1$s"', $this->option( 'action' ) ) );  | 
                                                        |
| 115 | +				throw new \Exception(sprintf('Invalid setup action "%1$s"', $this->option('action'))); | 
                                                        |
| 116 | 116 | }  | 
                                                        
| 117 | 117 | }  | 
                                                        
| 118 | 118 | |
@@ -125,8 +125,8 @@ discard block  | 
                                                    ||
| 125 | 125 | protected function getArguments()  | 
                                                        
| 126 | 126 |  	{ | 
                                                        
| 127 | 127 | return array(  | 
                                                        
| 128 | - array( 'site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default' ),  | 
                                                        |
| 129 | - array( 'tplsite', InputArgument::OPTIONAL, 'Site used as template for creating the new one', 'default' ),  | 
                                                        |
| 128 | +			array('site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default'), | 
                                                        |
| 129 | +			array('tplsite', InputArgument::OPTIONAL, 'Site used as template for creating the new one', 'default'), | 
                                                        |
| 130 | 130 | );  | 
                                                        
| 131 | 131 | }  | 
                                                        
| 132 | 132 | |
@@ -139,9 +139,9 @@ discard block  | 
                                                    ||
| 139 | 139 | protected function getOptions()  | 
                                                        
| 140 | 140 |  	{ | 
                                                        
| 141 | 141 | return array(  | 
                                                        
| 142 | - array( 'option', null, InputOption::VALUE_REQUIRED, 'Setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array() ),  | 
                                                        |
| 143 | - array( 'action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate' ),  | 
                                                        |
| 144 | - array( 'task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null ),  | 
                                                        |
| 142 | +			array('option', null, InputOption::VALUE_REQUIRED, 'Setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array()), | 
                                                        |
| 143 | +			array('action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate'), | 
                                                        |
| 144 | +			array('task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null), | 
                                                        |
| 145 | 145 | );  | 
                                                        
| 146 | 146 | }  | 
                                                        
| 147 | 147 | |
@@ -152,14 +152,14 @@ discard block  | 
                                                    ||
| 152 | 152 | * @param \Aimeos\MW\Config\Iface $conf Config object  | 
                                                        
| 153 | 153 | * @return array Multi-dimensional associative list of database configuration parameters  | 
                                                        
| 154 | 154 | */  | 
                                                        
| 155 | - protected function getDbConfig( \Aimeos\MW\Config\Iface $conf )  | 
                                                        |
| 155 | + protected function getDbConfig(\Aimeos\MW\Config\Iface $conf)  | 
                                                        |
| 156 | 156 |  	{ | 
                                                        
| 157 | - $dbconfig = $conf->get( 'resource', array() );  | 
                                                        |
| 157 | +		$dbconfig = $conf->get('resource', array()); | 
                                                        |
| 158 | 158 | |
| 159 | - foreach( $dbconfig as $rname => $dbconf )  | 
                                                        |
| 159 | + foreach ($dbconfig as $rname => $dbconf)  | 
                                                        |
| 160 | 160 |  		{ | 
                                                        
| 161 | -			if( strncmp( $rname, 'db', 2 ) !== 0 ) { | 
                                                        |
| 162 | - unset( $dbconfig[$rname] );  | 
                                                        |
| 161 | +			if (strncmp($rname, 'db', 2) !== 0) { | 
                                                        |
| 162 | + unset($dbconfig[$rname]);  | 
                                                        |
| 163 | 163 | }  | 
                                                        
| 164 | 164 | }  | 
                                                        
| 165 | 165 | |
@@ -174,12 +174,12 @@ discard block  | 
                                                    ||
| 174 | 174 | * @param array Associative list of database configurations  | 
                                                        
| 175 | 175 | * @throws \RuntimeException If the format of the options is invalid  | 
                                                        
| 176 | 176 | */  | 
                                                        
| 177 | - protected function setOptions( \Aimeos\MW\Config\Iface $conf )  | 
                                                        |
| 177 | + protected function setOptions(\Aimeos\MW\Config\Iface $conf)  | 
                                                        |
| 178 | 178 |  	{ | 
                                                        
| 179 | - foreach( (array) $this->option( 'option' ) as $option )  | 
                                                        |
| 179 | +		foreach ((array) $this->option('option') as $option) | 
                                                        |
| 180 | 180 |  		{ | 
                                                        
| 181 | - list( $name, $value ) = explode( ':', $option );  | 
                                                        |
| 182 | - $conf->set( str_replace( '\\', '/', $name ), $value );  | 
                                                        |
| 181 | +			list($name, $value) = explode(':', $option); | 
                                                        |
| 182 | +			$conf->set(str_replace('\\', '/', $name), $value); | 
                                                        |
| 183 | 183 | }  | 
                                                        
| 184 | 184 | }  | 
                                                        
| 185 | 185 | }  | 
                                                        
@@ -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 | }  | 
                                                        
@@ -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 | }  |