aimeos /
aimeos-laravel
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/css/tether.min.css"> |
| 11 | 11 | <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css"> |
| 12 | 12 | <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/css/bootstrap.min.css"> |
| 13 | - <link rel="stylesheet" href="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'type' => 'css' ) ); ?>"> |
|
| 13 | + <link rel="stylesheet" href="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'type' => 'css')); ?>"> |
|
| 14 | 14 | |
| 15 | 15 | <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> |
| 16 | 16 | <!--[if lt IE 9]> |
@@ -29,6 +29,6 @@ discard block |
||
| 29 | 29 | <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/js/bootstrap.min.js"></script> |
| 30 | 30 | <script src="//cdnjs.cloudflare.com/ajax/libs/ckeditor/4.5.4/ckeditor.js"></script> |
| 31 | 31 | <script src="//cdnjs.cloudflare.com/ajax/libs/ckeditor/4.5.4/adapters/jquery.js"></script> |
| 32 | - <script src="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'type' => 'js' ) ); ?>"></script> |
|
| 32 | + <script src="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'type' => 'js')); ?>"></script> |
|
| 33 | 33 | </body> |
| 34 | 34 | </html> |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | <link type="text/css" rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/resources/css/ext-all.css" /> |
| 10 | 10 | <link type="text/css" rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/resources/css/xtheme-gray.css" /> |
| 11 | 11 | @foreach ($cssFiles as $cssFile) |
| 12 | - <link rel="stylesheet" href="<?= asset('packages/aimeos/shop/' . $cssFile) ?>" /> |
|
| 12 | + <link rel="stylesheet" href="<?= asset('packages/aimeos/shop/'.$cssFile) ?>" /> |
|
| 13 | 13 | @endforeach |
| 14 | 14 | |
| 15 | 15 | <script type="text/javascript"> |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | |
| 46 | 46 | <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/adapter/ext/ext-base.js"></script> |
| 47 | 47 | <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/ext-all.js"></script> |
| 48 | - <script type="text/javascript" src="<?= route( 'aimeos_shop_extadm_file', array( 'site' => $site ) ); ?>"></script> |
|
| 48 | + <script type="text/javascript" src="<?= route('aimeos_shop_extadm_file', array('site' => $site)); ?>"></script> |
|
| 49 | 49 | |
| 50 | 50 | </head> |
| 51 | 51 | <body> |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | public function indexAction() |
| 32 | 32 | { |
| 33 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'account-index' ); |
|
| 33 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('account-index'); |
|
| 34 | 34 | return View::make('shop::account.index', $params); |
| 35 | 35 | } |
| 36 | 36 | |
@@ -42,17 +42,17 @@ discard block |
||
| 42 | 42 | */ |
| 43 | 43 | public function downloadAction() |
| 44 | 44 | { |
| 45 | - $context = app( '\Aimeos\Shop\Base\Context' )->get(); |
|
| 45 | + $context = app('\Aimeos\Shop\Base\Context')->get(); |
|
| 46 | 46 | $langid = $context->getLocale()->getLanguageId(); |
| 47 | 47 | |
| 48 | - $view = app( '\Aimeos\Shop\Base\View' )->create( $context, array(), $langid ); |
|
| 49 | - $context->setView( $view ); |
|
| 48 | + $view = app('\Aimeos\Shop\Base\View')->create($context, array(), $langid); |
|
| 49 | + $context->setView($view); |
|
| 50 | 50 | |
| 51 | - $client = \Aimeos\Client\Html\Factory::createClient( $context, array(), 'account/download' ); |
|
| 52 | - $client->setView( $view ); |
|
| 51 | + $client = \Aimeos\Client\Html\Factory::createClient($context, array(), 'account/download'); |
|
| 52 | + $client->setView($view); |
|
| 53 | 53 | $client->process(); |
| 54 | 54 | |
| 55 | 55 | $response = $view->response(); |
| 56 | - return Response::make( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() ); |
|
| 56 | + return Response::make((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders()); |
|
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | 59 | \ No newline at end of file |
@@ -36,20 +36,20 @@ |
||
| 36 | 36 | * @param \Illuminate\Http\Request $request Laravel request object |
| 37 | 37 | * @return \Illuminate\Contracts\View\View View for rendering the output |
| 38 | 38 | */ |
| 39 | - public function indexAction( Request $request ) |
|
| 39 | + public function indexAction(Request $request) |
|
| 40 | 40 | { |
| 41 | - if( config( 'shop.authorize', true ) && ( Auth::check() === false |
|
| 42 | - || $request->user()->can( 'admin', ['admin', 'editor'] ) ) === false |
|
| 41 | + if (config('shop.authorize', true) && (Auth::check() === false |
|
| 42 | + || $request->user()->can('admin', ['admin', 'editor'])) === false |
|
| 43 | 43 | ) { |
| 44 | - return View::make( 'shop::admin.index' ); |
|
| 44 | + return View::make('shop::admin.index'); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | $param = array( |
| 48 | 48 | 'resource' => 'dashboard', |
| 49 | - 'site' => Route::input( 'site', Input::get( 'site', 'default' ) ), |
|
| 50 | - 'lang' => Route::input( 'lang', Input::get( 'lang', config( 'app.locale', 'en' ) ) ) |
|
| 49 | + 'site' => Route::input('site', Input::get('site', 'default')), |
|
| 50 | + 'lang' => Route::input('lang', Input::get('lang', config('app.locale', 'en'))) |
|
| 51 | 51 | ); |
| 52 | 52 | |
| 53 | - return redirect()->route( 'aimeos_shop_jqadm_search', $param ); |
|
| 53 | + return redirect()->route('aimeos_shop_jqadm_search', $param); |
|
| 54 | 54 | } |
| 55 | 55 | } |
@@ -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 | ), |
@@ -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 | } |
@@ -207,8 +207,7 @@ |
||
| 207 | 207 | $localeItem = $localeManager->bootstrap( $sitecode, '', '', false ); |
| 208 | 208 | $localeItem->setLanguageId( null ); |
| 209 | 209 | $localeItem->setCurrencyId( null ); |
| 210 | - } |
|
| 211 | - catch( \Aimeos\MShop\Locale\Exception $e ) |
|
| 210 | + } catch( \Aimeos\MShop\Locale\Exception $e ) |
|
| 212 | 211 | { |
| 213 | 212 | $localeItem = $localeManager->createItem(); |
| 214 | 213 | } |
@@ -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; |
