@@ -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,25 +50,25 @@ 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 = Input::get( 'site', 'default' ); |
|
| 58 | - $currency = Input::get( 'currency', '' ); |
|
| 59 | - $lang = Input::get( 'locale', '' ); |
|
| 57 | + $site = Input::get('site', 'default'); |
|
| 58 | + $currency = Input::get('currency', ''); |
|
| 59 | + $lang = Input::get('locale', ''); |
|
| 60 | 60 | |
| 61 | - if( Route::current() ) |
|
| 61 | + if (Route::current()) |
|
| 62 | 62 | { |
| 63 | - $site = Route::input( 'site', $site ); |
|
| 64 | - $currency = Route::input( 'currency', $currency ); |
|
| 65 | - $lang = Route::input( 'locale', $lang ); |
|
| 63 | + $site = Route::input('site', $site); |
|
| 64 | + $currency = Route::input('currency', $currency); |
|
| 65 | + $lang = Route::input('locale', $lang); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - $disableSites = $this->config->get( 'shop.disableSites', true ); |
|
| 68 | + $disableSites = $this->config->get('shop.disableSites', true); |
|
| 69 | 69 | |
| 70 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
| 71 | - $this->locale = $localeManager->bootstrap( $site, $lang, $currency, $disableSites ); |
|
| 70 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
| 71 | + $this->locale = $localeManager->bootstrap($site, $lang, $currency, $disableSites); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | return $this->locale; |
@@ -82,17 +82,17 @@ discard block |
||
| 82 | 82 | * @param string $site Unique site code |
| 83 | 83 | * @return \Aimeos\MShop\Locale\Item\Iface Locale item object |
| 84 | 84 | */ |
| 85 | - public function getBackend( \Aimeos\MShop\Context\Item\Iface $context, $site ) |
|
| 85 | + public function getBackend(\Aimeos\MShop\Context\Item\Iface $context, $site) |
|
| 86 | 86 | { |
| 87 | - $localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' ); |
|
| 87 | + $localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale'); |
|
| 88 | 88 | |
| 89 | 89 | try |
| 90 | 90 | { |
| 91 | - $localeItem = $localeManager->bootstrap( $site, '', '', false ); |
|
| 92 | - $localeItem->setLanguageId( null ); |
|
| 93 | - $localeItem->setCurrencyId( null ); |
|
| 91 | + $localeItem = $localeManager->bootstrap($site, '', '', false); |
|
| 92 | + $localeItem->setLanguageId(null); |
|
| 93 | + $localeItem->setCurrencyId(null); |
|
| 94 | 94 | } |
| 95 | - catch( \Aimeos\MShop\Locale\Exception $e ) |
|
| 95 | + catch (\Aimeos\MShop\Locale\Exception $e) |
|
| 96 | 96 | { |
| 97 | 97 | $localeItem = $localeManager->createItem(); |
| 98 | 98 | } |
@@ -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,21 +53,21 @@ 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 | - $config = new \Aimeos\MW\Config\PHPArray( array(), $configPaths ); |
|
| 61 | + $config = new \Aimeos\MW\Config\PHPArray(array(), $configPaths); |
|
| 62 | 62 | |
| 63 | - if( function_exists( 'apc_store' ) === true && $this->config->get( 'shop.apc_enabled', false ) == true ) { |
|
| 64 | - $config = new \Aimeos\MW\Config\Decorator\APC( $config, $this->config->get( 'shop.apc_prefix', 'laravel:' ) ); |
|
| 63 | + if (function_exists('apc_store') === true && $this->config->get('shop.apc_enabled', false) == true) { |
|
| 64 | + $config = new \Aimeos\MW\Config\Decorator\APC($config, $this->config->get('shop.apc_prefix', 'laravel:')); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | - $config = new \Aimeos\MW\Config\Decorator\Memory( $config, $this->config->get( 'shop' ) ); |
|
| 67 | + $config = new \Aimeos\MW\Config\Decorator\Memory($config, $this->config->get('shop')); |
|
| 68 | 68 | |
| 69 | - if( ( $conf = $this->config->get( 'shop.' . $type, array() ) ) !== array() ) { |
|
| 70 | - $config = new \Aimeos\MW\Config\Decorator\Memory( $config, $conf ); |
|
| 69 | + if (($conf = $this->config->get('shop.'.$type, array())) !== array()) { |
|
| 70 | + $config = new \Aimeos\MW\Config\Decorator\Memory($config, $conf); |
|
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | $this->objects[$type] = $config; |
@@ -9,57 +9,57 @@ |
||
| 9 | 9 | |
| 10 | 10 | if( !function_exists( 'aiconfig' ) ) |
| 11 | 11 | { |
| 12 | - /** |
|
| 13 | - * Returns the configuration setting for the given key |
|
| 14 | - * |
|
| 15 | - * @param string $key Configuration key |
|
| 16 | - * @param mixed $default Default value if the configuration key isn't found |
|
| 17 | - * @return mixed Configuration value |
|
| 18 | - */ |
|
| 19 | - function aiconfig( $key, $default = null ) |
|
| 20 | - { |
|
| 21 | - return app( '\Aimeos\Shop\Base\Config' )->get()->get( $key, $default ); |
|
| 22 | - } |
|
| 12 | + /** |
|
| 13 | + * Returns the configuration setting for the given key |
|
| 14 | + * |
|
| 15 | + * @param string $key Configuration key |
|
| 16 | + * @param mixed $default Default value if the configuration key isn't found |
|
| 17 | + * @return mixed Configuration value |
|
| 18 | + */ |
|
| 19 | + function aiconfig( $key, $default = null ) |
|
| 20 | + { |
|
| 21 | + return app( '\Aimeos\Shop\Base\Config' )->get()->get( $key, $default ); |
|
| 22 | + } |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | |
| 26 | 26 | if( !function_exists( 'aitrans' ) ) |
| 27 | 27 | { |
| 28 | - /** |
|
| 29 | - * Translates the given message |
|
| 30 | - * |
|
| 31 | - * @param string $singular Message to translate |
|
| 32 | - * @param array $params List of paramters for replacing the placeholders in that order |
|
| 33 | - * @param string $domain Translation domain |
|
| 34 | - * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" |
|
| 35 | - * @return string Translated string |
|
| 36 | - */ |
|
| 37 | - function aitrans( $singular, array $params = array(), $domain = 'client', $locale = null ) |
|
| 38 | - { |
|
| 39 | - $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); |
|
| 28 | + /** |
|
| 29 | + * Translates the given message |
|
| 30 | + * |
|
| 31 | + * @param string $singular Message to translate |
|
| 32 | + * @param array $params List of paramters for replacing the placeholders in that order |
|
| 33 | + * @param string $domain Translation domain |
|
| 34 | + * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" |
|
| 35 | + * @return string Translated string |
|
| 36 | + */ |
|
| 37 | + function aitrans( $singular, array $params = array(), $domain = 'client', $locale = null ) |
|
| 38 | + { |
|
| 39 | + $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); |
|
| 40 | 40 | |
| 41 | - return vsprintf( $i18n->dt( $domain, $singular ), $params ); |
|
| 42 | - } |
|
| 41 | + return vsprintf( $i18n->dt( $domain, $singular ), $params ); |
|
| 42 | + } |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | |
| 46 | 46 | if( !function_exists( 'aitransplural' ) ) |
| 47 | 47 | { |
| 48 | - /** |
|
| 49 | - * Translates the given messages based on the number |
|
| 50 | - * |
|
| 51 | - * @param string $singular Message to translate |
|
| 52 | - * @param string $plural Message for plural translations |
|
| 53 | - * @param integer $number Count of items to chose the correct plural translation |
|
| 54 | - * @param array $params List of paramters for replacing the placeholders in that order |
|
| 55 | - * @param string $domain Translation domain |
|
| 56 | - * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" |
|
| 57 | - * @return string Translated string |
|
| 58 | - */ |
|
| 59 | - function aitransplural( $singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null ) |
|
| 60 | - { |
|
| 61 | - $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); |
|
| 48 | + /** |
|
| 49 | + * Translates the given messages based on the number |
|
| 50 | + * |
|
| 51 | + * @param string $singular Message to translate |
|
| 52 | + * @param string $plural Message for plural translations |
|
| 53 | + * @param integer $number Count of items to chose the correct plural translation |
|
| 54 | + * @param array $params List of paramters for replacing the placeholders in that order |
|
| 55 | + * @param string $domain Translation domain |
|
| 56 | + * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" |
|
| 57 | + * @return string Translated string |
|
| 58 | + */ |
|
| 59 | + function aitransplural( $singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null ) |
|
| 60 | + { |
|
| 61 | + $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); |
|
| 62 | 62 | |
| 63 | - return vsprintf( $i18n->dn( $domain, $singular, $plural, $number ), $params ); |
|
| 64 | - } |
|
| 63 | + return vsprintf( $i18n->dn( $domain, $singular, $plural, $number ), $params ); |
|
| 64 | + } |
|
| 65 | 65 | } |
@@ -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 | } |