| @@ -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; | 
| @@ -9,7 +9,7 @@ discard block | ||
| 9 | 9 | <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.css" /> | 
| 10 | 10 | <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" /> | 
| 11 | 11 | <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" /> | 
| 12 | - <link rel="stylesheet" href="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'lang' => 'en', 'type' => 'css' ) ); ?>" /> | |
| 12 | +		<link rel="stylesheet" href="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'lang' => 'en', 'type' => 'css')); ?>" /> | |
| 13 | 13 | </head> | 
| 14 | 14 | <body> | 
| 15 | 15 | <div class="app-menu" style="text-align: right; margin: 0 2.5%;"> | 
| @@ -33,6 +33,6 @@ discard block | ||
| 33 | 33 | <script src="https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.9.1/adapters/jquery.js"></script> | 
| 34 | 34 | <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"></script> | 
| 35 | 35 | <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js"></script> | 
| 36 | - <script src="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'lang' => 'en', 'type' => 'js' ) ); ?>"></script> | |
| 36 | +		<script src="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'lang' => 'en', 'type' => 'js')); ?>"></script> | |
| 37 | 37 | </body> | 
| 38 | 38 | </html> | 
| @@ -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::create( $context, 'log' ); | |
| 163 | + $logger = \Aimeos\MAdmin::create($context, 'log'); | |
| 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::create( $context, 'customer' ); | |
| 266 | - return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups(); | |
| 265 | + $manager = \Aimeos\MShop::create($context, 'customer'); | |
| 266 | +				return $manager->getItem($userid, array('customer/group'))->getGroups(); | |
| 267 | 267 | } ); | 
| 268 | 268 | } | 
| 269 | 269 | |
| @@ -44,7 +44,7 @@ discard block | ||
| 44 | 44 | * @param \Aimeos\Shop\Base\Context $context Context provider | 
| 45 | 45 | * @param \Aimeos\Shop\Base\Locale $locale Locale provider | 
| 46 | 46 | */ | 
| 47 | - public function __construct( \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale ) | |
| 47 | + public function __construct(\Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale) | |
| 48 | 48 |  	{ | 
| 49 | 49 | $this->context = $context; | 
| 50 | 50 | $this->locale = $locale; | 
| @@ -58,29 +58,29 @@ discard block | ||
| 58 | 58 | * @param string|array $groupcodes Unique user/customer group codes that are allowed | 
| 59 | 59 | * @return boolean True if user is part of the group, false if not | 
| 60 | 60 | */ | 
| 61 | - public function checkUserGroup( \Illuminate\Foundation\Auth\User $user, $groupcodes ) | |
| 61 | + public function checkUserGroup(\Illuminate\Foundation\Auth\User $user, $groupcodes) | |
| 62 | 62 |  	{ | 
| 63 | - $groups = ( is_array( $groupcodes ) ? implode( ',', $groupcodes ) : $groupcodes ); | |
| 63 | +		$groups = (is_array($groupcodes) ? implode(',', $groupcodes) : $groupcodes); | |
| 64 | 64 | |
| 65 | -		if( isset( $this->cache[$user->id][$groups] ) ) { | |
| 65 | +		if (isset($this->cache[$user->id][$groups])) { | |
| 66 | 66 | return $this->cache[$user->id][$groups]; | 
| 67 | 67 | } | 
| 68 | 68 | |
| 69 | 69 | $this->cache[$user->id][$groups] = false; | 
| 70 | - $context = $this->context->get( false ); | |
| 70 | + $context = $this->context->get(false); | |
| 71 | 71 | |
| 72 | 72 |  		try { | 
| 73 | - $site = \Aimeos\MShop::create( $context, 'locale/site' )->getItem( $user->siteid )->getCode(); | |
| 74 | -		} catch( \Exception $e ) { | |
| 75 | - $site = ( Route::current() ? Route::input( 'site', Input::get( 'site', 'default' ) ) : 'default' ); | |
| 73 | + $site = \Aimeos\MShop::create($context, 'locale/site')->getItem($user->siteid)->getCode(); | |
| 74 | +		} catch (\Exception $e) { | |
| 75 | +			$site = (Route::current() ? Route::input('site', Input::get('site', 'default')) : 'default'); | |
| 76 | 76 | } | 
| 77 | 77 | |
| 78 | - $context->setLocale( $this->locale->getBackend( $context, $site ) ); | |
| 78 | + $context->setLocale($this->locale->getBackend($context, $site)); | |
| 79 | 79 | |
| 80 | - foreach( array_reverse( $context->getLocale()->getSitePath() ) as $siteid ) | |
| 80 | + foreach (array_reverse($context->getLocale()->getSitePath()) as $siteid) | |
| 81 | 81 |  		{ | 
| 82 | -			if( (string) $user->siteid === (string) $siteid ) { | |
| 83 | - $this->cache[$user->id][$groups] = $this->checkGroups( $context, $user->id, $groupcodes ); | |
| 82 | +			if ((string) $user->siteid === (string) $siteid) { | |
| 83 | + $this->cache[$user->id][$groups] = $this->checkGroups($context, $user->id, $groupcodes); | |
| 84 | 84 | } | 
| 85 | 85 | } | 
| 86 | 86 | |
| @@ -96,20 +96,20 @@ discard block | ||
| 96 | 96 | * @return boolean True if user is part of the group, false if not | 
| 97 | 97 | * @deprecated Use checkUserGroup() instead | 
| 98 | 98 | */ | 
| 99 | - public function checkGroup( $userid, $groupcodes ) | |
| 99 | + public function checkGroup($userid, $groupcodes) | |
| 100 | 100 |  	{ | 
| 101 | - $groups = ( is_array( $groupcodes ) ? implode( ',', $groupcodes ) : $groupcodes ); | |
| 101 | +		$groups = (is_array($groupcodes) ? implode(',', $groupcodes) : $groupcodes); | |
| 102 | 102 | |
| 103 | -		if( isset( $this->cache[$userid][$groups] ) ) { | |
| 103 | +		if (isset($this->cache[$userid][$groups])) { | |
| 104 | 104 | return $this->cache[$userid][$groups]; | 
| 105 | 105 | } | 
| 106 | 106 | |
| 107 | - $site = ( Route::current() ? Route::input( 'site', Input::get( 'site', 'default' ) ) : 'default' ); | |
| 107 | +		$site = (Route::current() ? Route::input('site', Input::get('site', 'default')) : 'default'); | |
| 108 | 108 | |
| 109 | - $context = $this->context->get( false ); | |
| 110 | - $context->setLocale( $this->locale->getBackend( $context, $site ) ); | |
| 109 | + $context = $this->context->get(false); | |
| 110 | + $context->setLocale($this->locale->getBackend($context, $site)); | |
| 111 | 111 | |
| 112 | - return $this->cache[$userid][$groups] = $this->checkGroups( $context, $userid, $groupcodes ); | |
| 112 | + return $this->cache[$userid][$groups] = $this->checkGroups($context, $userid, $groupcodes); | |
| 113 | 113 | } | 
| 114 | 114 | |
| 115 | 115 | |
| @@ -119,15 +119,15 @@ discard block | ||
| 119 | 119 | * @param \Aimeos\MShop\Context\Item\Iface $context Context item | 
| 120 | 120 | * @return string[] List of group codes | 
| 121 | 121 | */ | 
| 122 | - public function getGroups( \Aimeos\MShop\Context\Item\Iface $context ) | |
| 122 | + public function getGroups(\Aimeos\MShop\Context\Item\Iface $context) | |
| 123 | 123 |  	{ | 
| 124 | 124 | $list = array(); | 
| 125 | - $manager = \Aimeos\MShop::create( $context, 'customer/group' ); | |
| 125 | + $manager = \Aimeos\MShop::create($context, 'customer/group'); | |
| 126 | 126 | |
| 127 | 127 | $search = $manager->createSearch(); | 
| 128 | - $search->setConditions( $search->compare( '==', 'customer.group.id', $context->getGroupIds() ) ); | |
| 128 | +		$search->setConditions($search->compare('==', 'customer.group.id', $context->getGroupIds())); | |
| 129 | 129 | |
| 130 | -		foreach( $manager->searchItems( $search ) as $item ) { | |
| 130 | +		foreach ($manager->searchItems($search) as $item) { | |
| 131 | 131 | $list[] = $item->getCode(); | 
| 132 | 132 | } | 
| 133 | 133 | |
| @@ -143,26 +143,26 @@ discard block | ||
| 143 | 143 | * @param string[] $groupcodes List of group codes to check against | 
| 144 | 144 | * @return boolean True if the user is in one of the groups, false if not | 
| 145 | 145 | */ | 
| 146 | - protected function checkGroups( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupcodes ) | |
| 146 | + protected function checkGroups(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupcodes) | |
| 147 | 147 |  	{ | 
| 148 | - $manager = \Aimeos\MShop::create( $context, 'customer/group' ); | |
| 148 | + $manager = \Aimeos\MShop::create($context, 'customer/group'); | |
| 149 | 149 | |
| 150 | 150 | $search = $manager->createSearch(); | 
| 151 | - $search->setConditions( $search->compare( '==', 'customer.group.code', (array) $groupcodes ) ); | |
| 152 | - $groupItems = $manager->searchItems( $search ); | |
| 151 | +		$search->setConditions($search->compare('==', 'customer.group.code', (array) $groupcodes)); | |
| 152 | + $groupItems = $manager->searchItems($search); | |
| 153 | 153 | |
| 154 | 154 | |
| 155 | - $manager = \Aimeos\MShop::create( $context, 'customer/lists' ); | |
| 155 | + $manager = \Aimeos\MShop::create($context, 'customer/lists'); | |
| 156 | 156 | |
| 157 | 157 | $search = $manager->createSearch(); | 
| 158 | 158 | $expr = array( | 
| 159 | - $search->compare( '==', 'customer.lists.parentid', $userid ), | |
| 160 | - $search->compare( '==', 'customer.lists.refid', array_keys( $groupItems ) ), | |
| 161 | - $search->compare( '==', 'customer.lists.domain', 'customer/group' ), | |
| 159 | +			$search->compare('==', 'customer.lists.parentid', $userid), | |
| 160 | +			$search->compare('==', 'customer.lists.refid', array_keys($groupItems)), | |
| 161 | +			$search->compare('==', 'customer.lists.domain', 'customer/group'), | |
| 162 | 162 | ); | 
| 163 | - $search->setConditions( $search->combine( '&&', $expr ) ); | |
| 164 | - $search->setSlice( 0, 1 ); | |
| 163 | +		$search->setConditions($search->combine('&&', $expr)); | |
| 164 | + $search->setSlice(0, 1); | |
| 165 | 165 | |
| 166 | - return (bool) count( $manager->searchItems( $search ) ); | |
| 166 | + return (bool) count($manager->searchItems($search)); | |
| 167 | 167 | } | 
| 168 | 168 | } | 
| @@ -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::create( $context, 'locale' ); | |
| 71 | - $this->locale = $localeManager->bootstrap( $site, $lang, $currency, $disableSites ); | |
| 70 | + $localeManager = \Aimeos\MShop::create($context, 'locale'); | |
| 71 | + $this->locale = $localeManager->bootstrap($site, $lang, $currency, $disableSites); | |
| 72 | 72 | } | 
| 73 | 73 | |
| 74 | 74 | return $this->locale; | 
| @@ -82,13 +82,13 @@ 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::create( $context, 'locale' ); | |
| 87 | + $localeManager = \Aimeos\MShop::create($context, 'locale'); | |
| 88 | 88 | |
| 89 | 89 |  		try { | 
| 90 | - $localeItem = $localeManager->bootstrap( $site, '', '', false, null, true ); | |
| 91 | -		} catch( \Aimeos\MShop\Exception $e ) { | |
| 90 | + $localeItem = $localeManager->bootstrap($site, '', '', false, null, true); | |
| 91 | +		} catch (\Aimeos\MShop\Exception $e) { | |
| 92 | 92 | $localeItem = $localeManager->createItem(); | 
| 93 | 93 | } | 
| 94 | 94 | |
| @@ -29,19 +29,19 @@ | ||
| 29 | 29 | * @param string|array $sites Unique site codes | 
| 30 | 30 | * @return \Aimeos\MShop\Locale\Item\Site\Iface[] List of site items | 
| 31 | 31 | */ | 
| 32 | - protected function getSiteItems( \Aimeos\MShop\Context\Item\Iface $context, $sites ) | |
| 32 | + protected function getSiteItems(\Aimeos\MShop\Context\Item\Iface $context, $sites) | |
| 33 | 33 |  	{ | 
| 34 | - $manager = \Aimeos\MShop::create( $context, 'locale/site' ); | |
| 34 | + $manager = \Aimeos\MShop::create($context, 'locale/site'); | |
| 35 | 35 | $search = $manager->createSearch(); | 
| 36 | 36 | |
| 37 | -		if( is_scalar( $sites ) && $sites != '' ) { | |
| 38 | - $sites = explode( ' ', $sites ); | |
| 37 | +		if (is_scalar($sites) && $sites != '') { | |
| 38 | +			$sites = explode(' ', $sites); | |
| 39 | 39 | } | 
| 40 | 40 | |
| 41 | -		if( !empty( $sites ) ) { | |
| 42 | - $search->setConditions( $search->compare( '==', 'locale.site.code', $sites ) ); | |
| 41 | +		if (!empty($sites)) { | |
| 42 | +			$search->setConditions($search->compare('==', 'locale.site.code', $sites)); | |
| 43 | 43 | } | 
| 44 | 44 | |
| 45 | - return $manager->searchItems( $search ); | |
| 45 | + return $manager->searchItems($search); | |
| 46 | 46 | } | 
| 47 | 47 | } | 
| 48 | 48 | \ No newline at end of file |