@@ -22,19 +22,19 @@ |
||
| 22 | 22 | * @param string|array $sites Unique site codes |
| 23 | 23 | * @return \Aimeos\MShop\Locale\Item\Site\Iface[] List of site items |
| 24 | 24 | */ |
| 25 | - protected function getSiteItems( \Aimeos\MShop\Context\Item\Iface $context, $sites ) |
|
| 25 | + protected function getSiteItems(\Aimeos\MShop\Context\Item\Iface $context, $sites) |
|
| 26 | 26 | { |
| 27 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' ); |
|
| 27 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site'); |
|
| 28 | 28 | $search = $manager->createSearch(); |
| 29 | 29 | |
| 30 | - if( is_scalar( $sites ) && $sites != '' ) { |
|
| 31 | - $sites = explode( ' ', $sites ); |
|
| 30 | + if (is_scalar($sites) && $sites != '') { |
|
| 31 | + $sites = explode(' ', $sites); |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | - if( !empty( $sites ) ) { |
|
| 35 | - $search->setConditions( $search->compare( '==', 'locale.site.code', $sites ) ); |
|
| 34 | + if (!empty($sites)) { |
|
| 35 | + $search->setConditions($search->compare('==', 'locale.site.code', $sites)); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - return $manager->searchItems( $search ); |
|
| 38 | + return $manager->searchItems($search); |
|
| 39 | 39 | } |
| 40 | 40 | } |
| 41 | 41 | \ No newline at end of file |
@@ -7,7 +7,7 @@ discard block |
||
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | 9 | |
| 10 | -if( !function_exists( 'aiconfig' ) ) |
|
| 10 | +if (!function_exists('aiconfig')) |
|
| 11 | 11 | { |
| 12 | 12 | /** |
| 13 | 13 | * Returns the configuration setting for the given key |
@@ -16,14 +16,14 @@ discard block |
||
| 16 | 16 | * @param mixed $default Default value if the configuration key isn't found |
| 17 | 17 | * @return mixed Configuration value |
| 18 | 18 | */ |
| 19 | - function aiconfig( $key, $default = null ) |
|
| 19 | + function aiconfig($key, $default = null) |
|
| 20 | 20 | { |
| 21 | - return app( '\Aimeos\Shop\Base\Config' )->get()->get( $key, $default ); |
|
| 21 | + return app('\Aimeos\Shop\Base\Config')->get()->get($key, $default); |
|
| 22 | 22 | } |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | |
| 26 | -if( !function_exists( 'aitrans' ) ) |
|
| 26 | +if (!function_exists('aitrans')) |
|
| 27 | 27 | { |
| 28 | 28 | /** |
| 29 | 29 | * Translates the given message |
@@ -34,16 +34,16 @@ discard block |
||
| 34 | 34 | * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" |
| 35 | 35 | * @return string Translated string |
| 36 | 36 | */ |
| 37 | - function aitrans( $singular, array $params = array(), $domain = 'client', $locale = null ) |
|
| 37 | + function aitrans($singular, array $params = array(), $domain = 'client', $locale = null) |
|
| 38 | 38 | { |
| 39 | - $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); |
|
| 39 | + $i18n = app('\Aimeos\Shop\Base\Context')->get()->getI18n($locale); |
|
| 40 | 40 | |
| 41 | - return vsprintf( $i18n->dt( $domain, $singular ), $params ); |
|
| 41 | + return vsprintf($i18n->dt($domain, $singular), $params); |
|
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | |
| 46 | -if( !function_exists( 'aitransplural' ) ) |
|
| 46 | +if (!function_exists('aitransplural')) |
|
| 47 | 47 | { |
| 48 | 48 | /** |
| 49 | 49 | * Translates the given messages based on the number |
@@ -56,10 +56,10 @@ discard block |
||
| 56 | 56 | * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" |
| 57 | 57 | * @return string Translated string |
| 58 | 58 | */ |
| 59 | - function aitransplural( $singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null ) |
|
| 59 | + function aitransplural($singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null) |
|
| 60 | 60 | { |
| 61 | - $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); |
|
| 61 | + $i18n = app('\Aimeos\Shop\Base\Context')->get()->getI18n($locale); |
|
| 62 | 62 | |
| 63 | - return vsprintf( $i18n->dn( $domain, $singular, $plural, $number ), $params ); |
|
| 63 | + return vsprintf($i18n->dn($domain, $singular, $plural, $number), $params); |
|
| 64 | 64 | } |
| 65 | 65 | } |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | * |
| 35 | 35 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object |
| 36 | 36 | */ |
| 37 | - public function __construct( \Illuminate\Contracts\Config\Repository $config ) |
|
| 37 | + public function __construct(\Illuminate\Contracts\Config\Repository $config) |
|
| 38 | 38 | { |
| 39 | 39 | $this->config = $config; |
| 40 | 40 | } |
@@ -47,16 +47,16 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | public function get() |
| 49 | 49 | { |
| 50 | - if( $this->object === null ) |
|
| 50 | + if ($this->object === null) |
|
| 51 | 51 | { |
| 52 | - $dir = base_path( 'ext' ); |
|
| 52 | + $dir = base_path('ext'); |
|
| 53 | 53 | |
| 54 | - if( !is_dir( $dir ) ) { |
|
| 55 | - $dir = dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . DIRECTORY_SEPARATOR . 'ext'; |
|
| 54 | + if (!is_dir($dir)) { |
|
| 55 | + $dir = dirname(dirname(dirname(dirname(__DIR__)))).DIRECTORY_SEPARATOR.'ext'; |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - $extDirs = (array) $this->config->get( 'shop.extdir', $dir ); |
|
| 59 | - $this->object = new \Aimeos\Bootstrap( $extDirs, false ); |
|
| 58 | + $extDirs = (array) $this->config->get('shop.extdir', $dir); |
|
| 59 | + $this->object = new \Aimeos\Bootstrap($extDirs, false); |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | return $this->object; |
@@ -70,12 +70,12 @@ discard block |
||
| 70 | 70 | */ |
| 71 | 71 | public function getVersion() |
| 72 | 72 | { |
| 73 | - if( ( $content = @file_get_contents( base_path( 'composer.lock' ) ) ) !== false |
|
| 74 | - && ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] ) |
|
| 73 | + if (($content = @file_get_contents(base_path('composer.lock'))) !== false |
|
| 74 | + && ($content = json_decode($content, true)) !== null && isset($content['packages']) |
|
| 75 | 75 | ) { |
| 76 | - foreach( (array) $content['packages'] as $item ) |
|
| 76 | + foreach ((array) $content['packages'] as $item) |
|
| 77 | 77 | { |
| 78 | - if( $item['name'] === 'aimeos/aimeos-laravel' ) { |
|
| 78 | + if ($item['name'] === 'aimeos/aimeos-laravel') { |
|
| 79 | 79 | return $item['version']; |
| 80 | 80 | } |
| 81 | 81 | } |
@@ -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,23 +53,23 @@ discard block |
||
| 53 | 53 | * @param integer $type Configuration type ("frontend" or "backend") |
| 54 | 54 | * @return \Aimeos\MW\Config\Iface Configuration object |
| 55 | 55 | */ |
| 56 | - public function get( $type = 'frontend' ) |
|
| 56 | + public function get($type = 'frontend') |
|
| 57 | 57 | { |
| 58 | - if( !isset( $this->objects[$type] ) ) |
|
| 58 | + if (!isset($this->objects[$type])) |
|
| 59 | 59 | { |
| 60 | 60 | $configPaths = $this->aimeos->get()->getConfigPaths(); |
| 61 | - $cfgfile = dirname( dirname( dirname( __DIR__ ) ) ) . DIRECTORY_SEPARATOR . 'default.php'; |
|
| 61 | + $cfgfile = dirname(dirname(dirname(__DIR__))).DIRECTORY_SEPARATOR.'default.php'; |
|
| 62 | 62 | |
| 63 | - $config = new \Aimeos\MW\Config\PHPArray( require $cfgfile, $configPaths ); |
|
| 63 | + $config = new \Aimeos\MW\Config\PHPArray(require $cfgfile, $configPaths); |
|
| 64 | 64 | |
| 65 | - if( $this->config->get( 'shop.apc_enabled', false ) == true ) { |
|
| 66 | - $config = new \Aimeos\MW\Config\Decorator\APC( $config, $this->config->get( 'shop.apc_prefix', 'laravel:' ) ); |
|
| 65 | + if ($this->config->get('shop.apc_enabled', false) == true) { |
|
| 66 | + $config = new \Aimeos\MW\Config\Decorator\APC($config, $this->config->get('shop.apc_prefix', 'laravel:')); |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - $config = new \Aimeos\MW\Config\Decorator\Memory( $config, $this->config->get( 'shop' ) ); |
|
| 69 | + $config = new \Aimeos\MW\Config\Decorator\Memory($config, $this->config->get('shop')); |
|
| 70 | 70 | |
| 71 | - if( ( $conf = $this->config->get( 'shop.' . $type, array() ) ) !== array() ) { |
|
| 72 | - $config = new \Aimeos\MW\Config\Decorator\Memory( $config, $conf ); |
|
| 71 | + if (($conf = $this->config->get('shop.'.$type, array())) !== array()) { |
|
| 72 | + $config = new \Aimeos\MW\Config\Decorator\Memory($config, $conf); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | $this->objects[$type] = $config; |
@@ -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( $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 ($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; |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | public function indexAction() |
| 31 | 31 | { |
| 32 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'basket-index' ); |
|
| 32 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('basket-index'); |
|
| 33 | 33 | return Response::view('shop::basket.index', $params)->header('Cache-Control', 'no-store'); |
| 34 | 34 | } |
| 35 | 35 | } |
| 36 | 36 | \ No newline at end of file |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | public function confirmAction() |
| 31 | 31 | { |
| 32 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-confirm' ); |
|
| 32 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-confirm'); |
|
| 33 | 33 | return Response::view('shop::checkout.confirm', $params)->header('Cache-Control', 'no-store'); |
| 34 | 34 | } |
| 35 | 35 | |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | */ |
| 42 | 42 | public function indexAction() |
| 43 | 43 | { |
| 44 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-index' ); |
|
| 44 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-index'); |
|
| 45 | 45 | return Response::view('shop::checkout.index', $params)->header('Cache-Control', 'no-store'); |
| 46 | 46 | } |
| 47 | 47 | |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | */ |
| 54 | 54 | public function updateAction() |
| 55 | 55 | { |
| 56 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-update' ); |
|
| 56 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-update'); |
|
| 57 | 57 | return Response::view('shop::checkout.update', $params)->header('Cache-Control', 'no-store'); |
| 58 | 58 | } |
| 59 | 59 | } |
| 60 | 60 | \ No newline at end of file |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | public function countAction() |
| 31 | 31 | { |
| 32 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'catalog-count' ); |
|
| 32 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('catalog-count'); |
|
| 33 | 33 | |
| 34 | 34 | return Response::view('shop::catalog.count', $params) |
| 35 | 35 | ->header('Content-Type', 'application/javascript'); |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | */ |
| 44 | 44 | public function detailAction() |
| 45 | 45 | { |
| 46 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-detail' ); |
|
| 46 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-detail'); |
|
| 47 | 47 | return Response::view('shop::catalog.detail', $params); |
| 48 | 48 | } |
| 49 | 49 | |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | */ |
| 56 | 56 | public function listAction() |
| 57 | 57 | { |
| 58 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-list' ); |
|
| 58 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-list'); |
|
| 59 | 59 | return Response::view('shop::catalog.list', $params); |
| 60 | 60 | } |
| 61 | 61 | |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | */ |
| 68 | 68 | public function stockAction() |
| 69 | 69 | { |
| 70 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-stock' ); |
|
| 70 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-stock'); |
|
| 71 | 71 | |
| 72 | 72 | return Response::view('shop::catalog.stock', $params) |
| 73 | 73 | ->header('Content-Type', 'application/javascript'); |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | */ |
| 82 | 82 | public function suggestAction() |
| 83 | 83 | { |
| 84 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-suggest' ); |
|
| 84 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-suggest'); |
|
| 85 | 85 | |
| 86 | 86 | return Response::view('shop::catalog.suggest', $params) |
| 87 | 87 | ->header('Content-Type', 'application/json'); |
@@ -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,36 +71,36 @@ 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->addProcess( $context ); |
|
| 90 | - $this->addSession( $context ); |
|
| 91 | - $this->addUser( $context); |
|
| 92 | - $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->addProcess($context); |
|
| 90 | + $this->addSession($context); |
|
| 91 | + $this->addUser($context); |
|
| 92 | + $this->addGroups($context); |
|
| 93 | 93 | |
| 94 | 94 | $this->context = $context; |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | - $this->context->setConfig( $config ); |
|
| 97 | + $this->context->setConfig($config); |
|
| 98 | 98 | |
| 99 | - if( $locale === true ) |
|
| 99 | + if ($locale === true) |
|
| 100 | 100 | { |
| 101 | - $localeItem = $this->locale->get( $this->context ); |
|
| 102 | - $this->context->setLocale( $localeItem ); |
|
| 103 | - $this->context->setI18n( $this->i18n->get( array( $localeItem->getLanguageId() ) ) ); |
|
| 101 | + $localeItem = $this->locale->get($this->context); |
|
| 102 | + $this->context->setLocale($localeItem); |
|
| 103 | + $this->context->setI18n($this->i18n->get(array($localeItem->getLanguageId()))); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | return $this->context; |
@@ -113,11 +113,11 @@ discard block |
||
| 113 | 113 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object including config |
| 114 | 114 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 115 | 115 | */ |
| 116 | - protected function addCache( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 116 | + protected function addCache(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 117 | 117 | { |
| 118 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context ); |
|
| 118 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context); |
|
| 119 | 119 | |
| 120 | - return $context->setCache( $cache ); |
|
| 120 | + return $context->setCache($cache); |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | |
@@ -127,11 +127,11 @@ 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() ); |
|
| 132 | + $dbm = new \Aimeos\MW\DB\Manager\DBAL($context->getConfig()); |
|
| 133 | 133 | |
| 134 | - return $context->setDatabaseManager( $dbm ); |
|
| 134 | + return $context->setDatabaseManager($dbm); |
|
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | |
@@ -141,14 +141,14 @@ discard block |
||
| 141 | 141 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 142 | 142 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 143 | 143 | */ |
| 144 | - protected function addFilesystemManager( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 144 | + protected function addFilesystemManager(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 145 | 145 | { |
| 146 | 146 | $config = $context->getConfig(); |
| 147 | - $path = storage_path( 'aimeos' ); |
|
| 147 | + $path = storage_path('aimeos'); |
|
| 148 | 148 | |
| 149 | - $fs = new \Aimeos\MW\Filesystem\Manager\Laravel( app( 'filesystem' ), $config, $path ); |
|
| 149 | + $fs = new \Aimeos\MW\Filesystem\Manager\Laravel(app('filesystem'), $config, $path); |
|
| 150 | 150 | |
| 151 | - return $context->setFilesystemManager( $fs ); |
|
| 151 | + return $context->setFilesystemManager($fs); |
|
| 152 | 152 | } |
| 153 | 153 | |
| 154 | 154 | |
@@ -158,11 +158,11 @@ discard block |
||
| 158 | 158 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 159 | 159 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 160 | 160 | */ |
| 161 | - protected function addLogger( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 161 | + protected function addLogger(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 162 | 162 | { |
| 163 | - $logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager( $context ); |
|
| 163 | + $logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager($context); |
|
| 164 | 164 | |
| 165 | - return $context->setLogger( $logger ); |
|
| 165 | + return $context->setLogger($logger); |
|
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | |
@@ -173,11 +173,11 @@ discard block |
||
| 173 | 173 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 174 | 174 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 175 | 175 | */ |
| 176 | - protected function addMailer( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 176 | + protected function addMailer(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 177 | 177 | { |
| 178 | - $mail = new \Aimeos\MW\Mail\Swift( function() { return app( 'mailer' )->getSwiftMailer(); } ); |
|
| 178 | + $mail = new \Aimeos\MW\Mail\Swift(function() { return app('mailer')->getSwiftMailer(); } ); |
|
| 179 | 179 | |
| 180 | - return $context->setMail( $mail ); |
|
| 180 | + return $context->setMail($mail); |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | |
@@ -187,11 +187,11 @@ discard block |
||
| 187 | 187 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 188 | 188 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 189 | 189 | */ |
| 190 | - protected function addMessageQueueManager( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 190 | + protected function addMessageQueueManager(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 191 | 191 | { |
| 192 | - $mq = new \Aimeos\MW\MQueue\Manager\Standard( $context->getConfig() ); |
|
| 192 | + $mq = new \Aimeos\MW\MQueue\Manager\Standard($context->getConfig()); |
|
| 193 | 193 | |
| 194 | - return $context->setMessageQueueManager( $mq ); |
|
| 194 | + return $context->setMessageQueueManager($mq); |
|
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | |
@@ -201,16 +201,16 @@ discard block |
||
| 201 | 201 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 202 | 202 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 203 | 203 | */ |
| 204 | - protected function addProcess( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 204 | + protected function addProcess(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 205 | 205 | { |
| 206 | 206 | $config = $context->getConfig(); |
| 207 | - $max = $config->get( 'pcntl_max', 4 ); |
|
| 208 | - $prio = $config->get( 'pcntl_priority', 19 ); |
|
| 207 | + $max = $config->get('pcntl_max', 4); |
|
| 208 | + $prio = $config->get('pcntl_priority', 19); |
|
| 209 | 209 | |
| 210 | - $process = new \Aimeos\MW\Process\Pcntl( $max, $prio ); |
|
| 211 | - $process = new \Aimeos\MW\Process\Decorator\Check( $process ); |
|
| 210 | + $process = new \Aimeos\MW\Process\Pcntl($max, $prio); |
|
| 211 | + $process = new \Aimeos\MW\Process\Decorator\Check($process); |
|
| 212 | 212 | |
| 213 | - return $context->setProcess( $process ); |
|
| 213 | + return $context->setProcess($process); |
|
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | |
@@ -220,11 +220,11 @@ discard block |
||
| 220 | 220 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 221 | 221 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 222 | 222 | */ |
| 223 | - protected function addSession( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 223 | + protected function addSession(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 224 | 224 | { |
| 225 | - $session = new \Aimeos\MW\Session\Laravel5( $this->session ); |
|
| 225 | + $session = new \Aimeos\MW\Session\Laravel5($this->session); |
|
| 226 | 226 | |
| 227 | - return $context->setSession( $session ); |
|
| 227 | + return $context->setSession($session); |
|
| 228 | 228 | } |
| 229 | 229 | |
| 230 | 230 | |
@@ -234,16 +234,16 @@ discard block |
||
| 234 | 234 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 235 | 235 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 236 | 236 | */ |
| 237 | - protected function addUser( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 237 | + protected function addUser(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 238 | 238 | { |
| 239 | - if( ( $userid = Auth::id() ) !== null ) { |
|
| 240 | - $context->setUserId( $userid ); |
|
| 239 | + if (($userid = Auth::id()) !== null) { |
|
| 240 | + $context->setUserId($userid); |
|
| 241 | 241 | } |
| 242 | 242 | |
| 243 | - if( ( $user = Auth::user() ) !== null ) { |
|
| 244 | - $context->setEditor( $user->name ); |
|
| 243 | + if (($user = Auth::user()) !== null) { |
|
| 244 | + $context->setEditor($user->name); |
|
| 245 | 245 | } else { |
| 246 | - $context->setEditor( \Request::ip() ); |
|
| 246 | + $context->setEditor(\Request::ip()); |
|
| 247 | 247 | } |
| 248 | 248 | |
| 249 | 249 | return $context; |
@@ -256,14 +256,14 @@ discard block |
||
| 256 | 256 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 257 | 257 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 258 | 258 | */ |
| 259 | - protected function addGroups( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 259 | + protected function addGroups(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 260 | 260 | { |
| 261 | - if( ( $userid = Auth::id() ) !== null ) |
|
| 261 | + if (($userid = Auth::id()) !== null) |
|
| 262 | 262 | { |
| 263 | - $context->setGroupIds( function() use ( $context, $userid ) |
|
| 263 | + $context->setGroupIds(function() use ($context, $userid) |
|
| 264 | 264 | { |
| 265 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' ); |
|
| 266 | - return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups(); |
|
| 265 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer'); |
|
| 266 | + return $manager->getItem($userid, array('customer/group'))->getGroups(); |
|
| 267 | 267 | } ); |
| 268 | 268 | } |
| 269 | 269 | |