@@ -4,20 +4,20 @@ discard block |
||
| 4 | 4 | |
| 5 | 5 | 'apc_enabled' => false, |
| 6 | 6 | 'apc_prefix' => 'laravel:', |
| 7 | - 'extdir' => ( is_dir(base_path('ext')) ? base_path('ext') : dirname(__DIR__) . DIRECTORY_SEPARATOR . 'ext' ), |
|
| 7 | + 'extdir' => (is_dir(base_path('ext')) ? base_path('ext') : dirname(__DIR__).DIRECTORY_SEPARATOR.'ext'), |
|
| 8 | 8 | 'uploaddir' => '/', |
| 9 | 9 | |
| 10 | 10 | 'page' => array( |
| 11 | - 'account-index' => array( 'account/profile','account/history','account/favorite','account/watch','basket/mini','catalog/session' ), |
|
| 12 | - 'basket-index' => array( 'basket/standard','basket/related' ), |
|
| 13 | - 'catalog-count' => array( 'catalog/count' ), |
|
| 14 | - 'catalog-detail' => array( 'basket/mini','catalog/stage','catalog/detail','catalog/session' ), |
|
| 15 | - 'catalog-list' => array( 'basket/mini','catalog/filter','catalog/stage','catalog/lists' ), |
|
| 16 | - 'catalog-stock' => array( 'catalog/stock' ), |
|
| 17 | - 'catalog-suggest' => array( 'catalog/suggest' ), |
|
| 18 | - 'checkout-confirm' => array( 'checkout/confirm' ), |
|
| 19 | - 'checkout-index' => array( 'checkout/standard' ), |
|
| 20 | - 'checkout-update' => array( 'checkout/update'), |
|
| 11 | + 'account-index' => array('account/profile', 'account/history', 'account/favorite', 'account/watch', 'basket/mini', 'catalog/session'), |
|
| 12 | + 'basket-index' => array('basket/standard', 'basket/related'), |
|
| 13 | + 'catalog-count' => array('catalog/count'), |
|
| 14 | + 'catalog-detail' => array('basket/mini', 'catalog/stage', 'catalog/detail', 'catalog/session'), |
|
| 15 | + 'catalog-list' => array('basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists'), |
|
| 16 | + 'catalog-stock' => array('catalog/stock'), |
|
| 17 | + 'catalog-suggest' => array('catalog/suggest'), |
|
| 18 | + 'checkout-confirm' => array('checkout/confirm'), |
|
| 19 | + 'checkout-index' => array('checkout/standard'), |
|
| 20 | + 'checkout-update' => array('checkout/update'), |
|
| 21 | 21 | ), |
| 22 | 22 | |
| 23 | 23 | 'resource' => array( |
@@ -28,24 +28,24 @@ discard block |
||
| 28 | 28 | 'database' => env('DB_DATABASE', 'laravel'), |
| 29 | 29 | 'username' => env('DB_USERNAME', 'root'), |
| 30 | 30 | 'password' => env('DB_PASSWORD', ''), |
| 31 | - 'stmt' => array( "SET NAMES 'utf8'", "SET SESSION sql_mode='ANSI'" ), |
|
| 31 | + 'stmt' => array("SET NAMES 'utf8'", "SET SESSION sql_mode='ANSI'"), |
|
| 32 | 32 | 'opt-persistent' => 0, |
| 33 | 33 | 'limit' => 2, |
| 34 | 34 | ), |
| 35 | 35 | 'fs' => array( |
| 36 | 36 | 'adapter' => 'Standard', |
| 37 | 37 | 'basedir' => public_path(), |
| 38 | - 'tempdir' => storage_path( 'tmp' ), |
|
| 38 | + 'tempdir' => storage_path('tmp'), |
|
| 39 | 39 | ), |
| 40 | 40 | 'fs-admin' => array( |
| 41 | 41 | 'adapter' => 'Standard', |
| 42 | - 'basedir' => public_path( 'uploads' ), |
|
| 43 | - 'tempdir' => storage_path( 'tmp' ), |
|
| 42 | + 'basedir' => public_path('uploads'), |
|
| 43 | + 'tempdir' => storage_path('tmp'), |
|
| 44 | 44 | ), |
| 45 | 45 | 'fs-secure' => array( |
| 46 | 46 | 'adapter' => 'Standard', |
| 47 | - 'basedir' => storage_path( 'secure' ), |
|
| 48 | - 'tempdir' => storage_path( 'tmp' ), |
|
| 47 | + 'basedir' => storage_path('secure'), |
|
| 48 | + 'tempdir' => storage_path('tmp'), |
|
| 49 | 49 | ), |
| 50 | 50 | 'mq' => array( |
| 51 | 51 | 'adapter' => 'Standard', |
@@ -267,7 +267,7 @@ discard block |
||
| 267 | 267 | # in the "maxwidth" parameter |
| 268 | 268 | # 'maxheight' => 280, |
| 269 | 269 | ), |
| 270 | - 'tempdir' => storage_path( 'aimeos' ), |
|
| 270 | + 'tempdir' => storage_path('aimeos'), |
|
| 271 | 271 | ), |
| 272 | 272 | ), |
| 273 | 273 | ), |
@@ -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, 'backend' ); |
|
| 46 | - $context->setEditor( 'aimeos:cache' ); |
|
| 45 | + $context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false, 'backend'); |
|
| 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, 'backend' ); |
|
| 74 | - $ctx->setEditor( 'aimeos:setup' ); |
|
| 73 | + $ctx = $this->getLaravel()->make('\Aimeos\Shop\Base\Context')->get(false, 'backend'); |
|
| 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( $name, $value ); |
|
| 181 | + list($name, $value) = explode(':', $option); |
|
| 182 | + $conf->set($name, $value); |
|
| 183 | 183 | } |
| 184 | 184 | } |
| 185 | 185 | } |
@@ -43,21 +43,21 @@ 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(), 'en', '', false ); |
|
| 55 | - $context->setLocale( $localeItem ); |
|
| 54 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), 'en', '', false); |
|
| 55 | + $context->setLocale($localeItem); |
|
| 56 | 56 | |
| 57 | - $this->info( sprintf( 'Executing the Aimeos jobs for "%s"', $siteItem->getCode() ) ); |
|
| 57 | + $this->info(sprintf('Executing the Aimeos jobs for "%s"', $siteItem->getCode())); |
|
| 58 | 58 | |
| 59 | - foreach( $jobs as $jobname ) { |
|
| 60 | - \Aimeos\Controller\Jobs\Factory::createController( $context, $aimeos, $jobname )->run(); |
|
| 59 | + foreach ($jobs as $jobname) { |
|
| 60 | + \Aimeos\Controller\Jobs\Factory::createController($context, $aimeos, $jobname)->run(); |
|
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | 63 | } |
@@ -71,8 +71,8 @@ discard block |
||
| 71 | 71 | protected function getArguments() |
| 72 | 72 | { |
| 73 | 73 | return array( |
| 74 | - array( 'jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"' ), |
|
| 75 | - array( 'site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)' ), |
|
| 74 | + array('jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"'), |
|
| 75 | + array('site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)'), |
|
| 76 | 76 | ); |
| 77 | 77 | } |
| 78 | 78 | |
@@ -95,19 +95,19 @@ discard block |
||
| 95 | 95 | protected function getContext() |
| 96 | 96 | { |
| 97 | 97 | $lv = $this->getLaravel(); |
| 98 | - $aimeos = $lv->make( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
| 99 | - $context = $lv->make( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' ); |
|
| 98 | + $aimeos = $lv->make('\Aimeos\Shop\Base\Aimeos')->get(); |
|
| 99 | + $context = $lv->make('\Aimeos\Shop\Base\Context')->get(false, 'backend'); |
|
| 100 | 100 | |
| 101 | - $tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' ); |
|
| 102 | - $view = $lv->make( '\Aimeos\Shop\Base\View' )->create( $context, $tmplPaths ); |
|
| 101 | + $tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates'); |
|
| 102 | + $view = $lv->make('\Aimeos\Shop\Base\View')->create($context, $tmplPaths); |
|
| 103 | 103 | |
| 104 | - $langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context )->getSubManager( 'language' ); |
|
| 105 | - $langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) ); |
|
| 106 | - $i18n = $lv->make( '\Aimeos\Shop\Base\I18n' )->get( $langids ); |
|
| 104 | + $langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context)->getSubManager('language'); |
|
| 105 | + $langids = array_keys($langManager->searchItems($langManager->createSearch(true))); |
|
| 106 | + $i18n = $lv->make('\Aimeos\Shop\Base\I18n')->get($langids); |
|
| 107 | 107 | |
| 108 | - $context->setEditor( 'aimeos:jobs' ); |
|
| 109 | - $context->setView( $view ); |
|
| 110 | - $context->setI18n( $i18n ); |
|
| 108 | + $context->setEditor('aimeos:jobs'); |
|
| 109 | + $context->setView($view); |
|
| 110 | + $context->setI18n($i18n); |
|
| 111 | 111 | |
| 112 | 112 | return $context; |
| 113 | 113 | } |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object |
| 36 | 36 | * @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object |
| 37 | 37 | */ |
| 38 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos ) |
|
| 38 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos) |
|
| 39 | 39 | { |
| 40 | 40 | $this->aimeos = $aimeos; |
| 41 | 41 | $this->config = $config; |
@@ -48,19 +48,19 @@ discard block |
||
| 48 | 48 | * @param integer $type Configuration type ("frontend" or "backend") |
| 49 | 49 | * @return \Aimeos\MW\Config\Iface Configuration object |
| 50 | 50 | */ |
| 51 | - public function get( $type = 'frontend' ) |
|
| 51 | + public function get($type = 'frontend') |
|
| 52 | 52 | { |
| 53 | 53 | $configPaths = $this->aimeos->get()->getConfigPaths(); |
| 54 | - $config = new \Aimeos\MW\Config\PHPArray( array(), $configPaths ); |
|
| 54 | + $config = new \Aimeos\MW\Config\PHPArray(array(), $configPaths); |
|
| 55 | 55 | |
| 56 | - if( function_exists( 'apc_store' ) === true && $this->config->get( 'shop.apc_enabled', false ) == true ) { |
|
| 57 | - $config = new \Aimeos\MW\Config\Decorator\APC( $config, $this->config->get( 'shop.apc_prefix', 'laravel:' ) ); |
|
| 56 | + if (function_exists('apc_store') === true && $this->config->get('shop.apc_enabled', false) == true) { |
|
| 57 | + $config = new \Aimeos\MW\Config\Decorator\APC($config, $this->config->get('shop.apc_prefix', 'laravel:')); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | - $config = new \Aimeos\MW\Config\Decorator\Memory( $config, $this->config->get( 'shop' ) ); |
|
| 60 | + $config = new \Aimeos\MW\Config\Decorator\Memory($config, $this->config->get('shop')); |
|
| 61 | 61 | |
| 62 | - if( ( $conf = $this->config->get( 'shop.' . $type, array() ) ) !== array() ) { |
|
| 63 | - $config = new \Aimeos\MW\Config\Decorator\Memory( $config, $conf ); |
|
| 62 | + if (($conf = $this->config->get('shop.'.$type, array())) !== array()) { |
|
| 63 | + $config = new \Aimeos\MW\Config\Decorator\Memory($config, $conf); |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | return $config; |
@@ -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 | |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | * |
| 39 | 39 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object |
| 40 | 40 | */ |
| 41 | - public function __construct( \Illuminate\Contracts\Config\Repository $config ) |
|
| 41 | + public function __construct(\Illuminate\Contracts\Config\Repository $config) |
|
| 42 | 42 | { |
| 43 | 43 | $this->config = $config; |
| 44 | 44 | } |
@@ -50,18 +50,18 @@ discard block |
||
| 50 | 50 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 51 | 51 | * @return \Aimeos\MShop\Locale\Item\Iface Locale item object |
| 52 | 52 | */ |
| 53 | - public function get( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 53 | + public function get(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 54 | 54 | { |
| 55 | - if( $this->locale === null ) |
|
| 55 | + if ($this->locale === null) |
|
| 56 | 56 | { |
| 57 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); |
|
| 58 | - $currency = Route::input( 'currency', Input::get( 'currency', '' ) ); |
|
| 59 | - $lang = Route::input( 'locale', Input::get( 'locale', '' ) ); |
|
| 57 | + $site = Route::input('site', Input::get('site', 'default')); |
|
| 58 | + $currency = Route::input('currency', Input::get('currency', '')); |
|
| 59 | + $lang = Route::input('locale', Input::get('locale', '')); |
|
| 60 | 60 | |
| 61 | - $disableSites = $this->config->get( 'shop.disableSites', true ); |
|
| 61 | + $disableSites = $this->config->get('shop.disableSites', true); |
|
| 62 | 62 | |
| 63 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
| 64 | - $this->locale = $localeManager->bootstrap( $site, $lang, $currency, $disableSites ); |
|
| 63 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
| 64 | + $this->locale = $localeManager->bootstrap($site, $lang, $currency, $disableSites); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | return $this->locale; |
@@ -75,17 +75,17 @@ discard block |
||
| 75 | 75 | * @param string $site Unique site code |
| 76 | 76 | * @return \Aimeos\MShop\Locale\Item\Iface Locale item object |
| 77 | 77 | */ |
| 78 | - public function getBackend( \Aimeos\MShop\Context\Item\Iface $context, $site ) |
|
| 78 | + public function getBackend(\Aimeos\MShop\Context\Item\Iface $context, $site) |
|
| 79 | 79 | { |
| 80 | - $localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' ); |
|
| 80 | + $localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale'); |
|
| 81 | 81 | |
| 82 | 82 | try |
| 83 | 83 | { |
| 84 | - $localeItem = $localeManager->bootstrap( $site, '', '', false ); |
|
| 85 | - $localeItem->setLanguageId( null ); |
|
| 86 | - $localeItem->setCurrencyId( null ); |
|
| 84 | + $localeItem = $localeManager->bootstrap($site, '', '', false); |
|
| 85 | + $localeItem->setLanguageId(null); |
|
| 86 | + $localeItem->setCurrencyId(null); |
|
| 87 | 87 | } |
| 88 | - catch( \Aimeos\MShop\Locale\Exception $e ) |
|
| 88 | + catch (\Aimeos\MShop\Locale\Exception $e) |
|
| 89 | 89 | { |
| 90 | 90 | $localeItem = $localeManager->createItem(); |
| 91 | 91 | } |
@@ -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; |
@@ -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, 'backend' ); |
|
| 52 | - $context->setEditor( 'aimeos:account' ); |
|
| 51 | + $context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false, 'backend'); |
|
| 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,22 +146,22 @@ 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 ); |
|
| 159 | + $item->setCode($email); |
|
| 160 | + $item->setLabel($email); |
|
| 161 | + $item->getPaymentAddress()->setEmail($email); |
|
| 162 | + $item->setPassword($password); |
|
| 163 | 163 | |
| 164 | - $manager->saveItem( $item ); |
|
| 164 | + $manager->saveItem($item); |
|
| 165 | 165 | |
| 166 | 166 | return $item; |
| 167 | 167 | } |
@@ -175,8 +175,8 @@ discard block |
||
| 175 | 175 | protected function getArguments() |
| 176 | 176 | { |
| 177 | 177 | return array( |
| 178 | - array( 'email', InputArgument::REQUIRED, 'E-mail address of the account that should be created' ), |
|
| 179 | - array( 'site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default unittest" (none for all)' ), |
|
| 178 | + array('email', InputArgument::REQUIRED, 'E-mail address of the account that should be created'), |
|
| 179 | + array('site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default unittest" (none for all)'), |
|
| 180 | 180 | ); |
| 181 | 181 | } |
| 182 | 182 | |
@@ -188,21 +188,21 @@ discard block |
||
| 188 | 188 | * @param string $code Unique customer group code |
| 189 | 189 | * @return \Aimeos\MShop\Customer\Item\Group\Iface Aimeos customer group item object |
| 190 | 190 | */ |
| 191 | - protected function getGroupItem( \Aimeos\MShop\Context\Item\Iface $context, $code ) |
|
| 191 | + protected function getGroupItem(\Aimeos\MShop\Context\Item\Iface $context, $code) |
|
| 192 | 192 | { |
| 193 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'group' ); |
|
| 193 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('group'); |
|
| 194 | 194 | |
| 195 | 195 | try |
| 196 | 196 | { |
| 197 | - $item = $manager->findItem( $code ); |
|
| 197 | + $item = $manager->findItem($code); |
|
| 198 | 198 | } |
| 199 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 199 | + catch (\Aimeos\MShop\Exception $e) |
|
| 200 | 200 | { |
| 201 | 201 | $item = $manager->createItem(); |
| 202 | - $item->setLabel( $code ); |
|
| 203 | - $item->setCode( $code ); |
|
| 202 | + $item->setLabel($code); |
|
| 203 | + $item->setCode($code); |
|
| 204 | 204 | |
| 205 | - $manager->saveItem( $item ); |
|
| 205 | + $manager->saveItem($item); |
|
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | return $item; |
@@ -217,10 +217,10 @@ discard block |
||
| 217 | 217 | protected function getOptions() |
| 218 | 218 | { |
| 219 | 219 | return array( |
| 220 | - array( 'password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)' ), |
|
| 221 | - array( 'admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges' ), |
|
| 222 | - array( 'api', null, InputOption::VALUE_NONE, 'If account should be able to access the APIs' ), |
|
| 223 | - array( 'editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges' ), |
|
| 220 | + array('password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)'), |
|
| 221 | + array('admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges'), |
|
| 222 | + array('api', null, InputOption::VALUE_NONE, 'If account should be able to access the APIs'), |
|
| 223 | + array('editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges'), |
|
| 224 | 224 | ); |
| 225 | 225 | } |
| 226 | 226 | } |