@@ -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->getName() ); |
|
| 243 | + if (($user = Auth::user()) !== null) { |
|
| 244 | + $context->setEditor($user->getName()); |
|
| 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 | |