@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object |
46 | 46 | * @param \Illuminate\Session\Store $session Laravel session object |
47 | 47 | */ |
48 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, \Illuminate\Session\Store $session ) |
|
48 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, \Illuminate\Session\Store $session) |
|
49 | 49 | { |
50 | 50 | $this->config = $config; |
51 | 51 | $this->session = $session; |
@@ -58,48 +58,48 @@ discard block |
||
58 | 58 | * @param boolean $locale True to add locale object to context, false if not |
59 | 59 | * @return \Aimeos\MShop\Context\Item\Iface Context object |
60 | 60 | */ |
61 | - public function get( $locale = true ) |
|
61 | + public function get($locale = true) |
|
62 | 62 | { |
63 | - if( self::$context === null ) |
|
63 | + if (self::$context === null) |
|
64 | 64 | { |
65 | 65 | $context = new \Aimeos\MShop\Context\Item\Standard(); |
66 | 66 | |
67 | 67 | $config = $this->getConfig(); |
68 | - $context->setConfig( $config ); |
|
68 | + $context->setConfig($config); |
|
69 | 69 | |
70 | - $dbm = new \Aimeos\MW\DB\Manager\PDO( $config ); |
|
71 | - $context->setDatabaseManager( $dbm ); |
|
70 | + $dbm = new \Aimeos\MW\DB\Manager\PDO($config); |
|
71 | + $context->setDatabaseManager($dbm); |
|
72 | 72 | |
73 | - $fs = new \Aimeos\MW\Filesystem\Manager\Laravel( app( 'filesystem' ), $config, storage_path( 'aimeos' ) ); |
|
74 | - $context->setFilesystemManager( $fs ); |
|
73 | + $fs = new \Aimeos\MW\Filesystem\Manager\Laravel(app('filesystem'), $config, storage_path('aimeos')); |
|
74 | + $context->setFilesystemManager($fs); |
|
75 | 75 | |
76 | - $mail = new \Aimeos\MW\Mail\Swift( function() { return app( 'mailer' )->getSwiftMailer(); } ); |
|
77 | - $context->setMail( $mail ); |
|
76 | + $mail = new \Aimeos\MW\Mail\Swift(function() { return app('mailer')->getSwiftMailer(); } ); |
|
77 | + $context->setMail($mail); |
|
78 | 78 | |
79 | - $logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager( $context ); |
|
80 | - $context->setLogger( $logger ); |
|
79 | + $logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager($context); |
|
80 | + $context->setLogger($logger); |
|
81 | 81 | |
82 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context ); |
|
83 | - $context->setCache( $cache ); |
|
82 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context); |
|
83 | + $context->setCache($cache); |
|
84 | 84 | |
85 | 85 | self::$context = $context; |
86 | 86 | } |
87 | 87 | |
88 | 88 | $context = self::$context; |
89 | 89 | |
90 | - if( $locale === true ) |
|
90 | + if ($locale === true) |
|
91 | 91 | { |
92 | - $localeItem = $this->getLocale( $context ); |
|
92 | + $localeItem = $this->getLocale($context); |
|
93 | 93 | $langid = $localeItem->getLanguageId(); |
94 | 94 | |
95 | - $context->setLocale( $localeItem ); |
|
96 | - $context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $langid ) ) ); |
|
95 | + $context->setLocale($localeItem); |
|
96 | + $context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($langid))); |
|
97 | 97 | } |
98 | 98 | |
99 | - $session = new \Aimeos\MW\Session\Laravel5( $this->session ); |
|
100 | - $context->setSession( $session ); |
|
99 | + $session = new \Aimeos\MW\Session\Laravel5($this->session); |
|
100 | + $context->setSession($session); |
|
101 | 101 | |
102 | - $this->addUser( $context ); |
|
102 | + $this->addUser($context); |
|
103 | 103 | |
104 | 104 | return $context; |
105 | 105 | } |
@@ -110,20 +110,20 @@ discard block |
||
110 | 110 | * |
111 | 111 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
112 | 112 | */ |
113 | - protected function addUser( \Aimeos\MShop\Context\Item\Iface $context ) |
|
113 | + protected function addUser(\Aimeos\MShop\Context\Item\Iface $context) |
|
114 | 114 | { |
115 | - if( ( $userid = \Auth::id() ) !== null ) |
|
115 | + if (($userid = \Auth::id()) !== null) |
|
116 | 116 | { |
117 | - $context->setUserId( $userid ); |
|
118 | - $context->setGroupIds( function() use ( $context, $userid ) |
|
117 | + $context->setUserId($userid); |
|
118 | + $context->setGroupIds(function() use ($context, $userid) |
|
119 | 119 | { |
120 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' ); |
|
121 | - return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups(); |
|
120 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer'); |
|
121 | + return $manager->getItem($userid, array('customer/group'))->getGroups(); |
|
122 | 122 | } ); |
123 | 123 | } |
124 | 124 | |
125 | - if( ( $user = \Auth::user() ) !== null ) { |
|
126 | - $context->setEditor( $user->name ); |
|
125 | + if (($user = \Auth::user()) !== null) { |
|
126 | + $context->setEditor($user->name); |
|
127 | 127 | } |
128 | 128 | } |
129 | 129 | |
@@ -135,13 +135,13 @@ discard block |
||
135 | 135 | */ |
136 | 136 | protected function getConfig() |
137 | 137 | { |
138 | - $conf = $this->config->get( 'shop' ); |
|
138 | + $conf = $this->config->get('shop'); |
|
139 | 139 | |
140 | - $configPaths = app( '\Aimeos\Shop\Base\Aimeos' )->get()->getConfigPaths( 'mysql' ); |
|
141 | - $config = new \Aimeos\MW\Config\PHPArray( $conf, $configPaths ); |
|
140 | + $configPaths = app('\Aimeos\Shop\Base\Aimeos')->get()->getConfigPaths('mysql'); |
|
141 | + $config = new \Aimeos\MW\Config\PHPArray($conf, $configPaths); |
|
142 | 142 | |
143 | - if( function_exists( 'apc_store' ) === true && $this->config->get( 'shop.apc_enabled', false ) == true ) { |
|
144 | - $config = new \Aimeos\MW\Config\Decorator\APC( $config, $this->config->get( 'shop.apc_prefix', 'laravel:' ) ); |
|
143 | + if (function_exists('apc_store') === true && $this->config->get('shop.apc_enabled', false) == true) { |
|
144 | + $config = new \Aimeos\MW\Config\Decorator\APC($config, $this->config->get('shop.apc_prefix', 'laravel:')); |
|
145 | 145 | } |
146 | 146 | |
147 | 147 | return $config; |
@@ -154,15 +154,15 @@ discard block |
||
154 | 154 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
155 | 155 | * @return \Aimeos\MShop\Locale\Item\Iface Locale item object |
156 | 156 | */ |
157 | - protected function getLocale( \Aimeos\MShop\Context\Item\Iface $context ) |
|
157 | + protected function getLocale(\Aimeos\MShop\Context\Item\Iface $context) |
|
158 | 158 | { |
159 | - if( $this->locale === null ) |
|
159 | + if ($this->locale === null) |
|
160 | 160 | { |
161 | - if( \Route::current() !== null ) |
|
161 | + if (\Route::current() !== null) |
|
162 | 162 | { |
163 | - $site = \Route::input( 'site', 'default' ); |
|
164 | - $lang = \Route::input( 'locale', '' ); |
|
165 | - $currency = \Route::input( 'currency', '' ); |
|
163 | + $site = \Route::input('site', 'default'); |
|
164 | + $lang = \Route::input('locale', ''); |
|
165 | + $currency = \Route::input('currency', ''); |
|
166 | 166 | } |
167 | 167 | else |
168 | 168 | { |
@@ -170,10 +170,10 @@ discard block |
||
170 | 170 | $lang = $currency = ''; |
171 | 171 | } |
172 | 172 | |
173 | - $disableSites = $this->config->has( 'shop.disableSites' ); |
|
173 | + $disableSites = $this->config->has('shop.disableSites'); |
|
174 | 174 | |
175 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
176 | - $this->locale = $localeManager->bootstrap( $site, $lang, $currency, $disableSites ); |
|
175 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
176 | + $this->locale = $localeManager->bootstrap($site, $lang, $currency, $disableSites); |
|
177 | 177 | } |
178 | 178 | |
179 | 179 | return $this->locale; |
@@ -47,8 +47,8 @@ discard block |
||
47 | 47 | * @param \Aimeos\Shop\Base\Context $context Context object |
48 | 48 | * @param \Aimeos\Shop\Base\View $view View object |
49 | 49 | */ |
50 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, |
|
51 | - \Aimeos\Shop\Base\Aimeos $aimeos, \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\View $view ) |
|
50 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, |
|
51 | + \Aimeos\Shop\Base\Aimeos $aimeos, \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\View $view) |
|
52 | 52 | { |
53 | 53 | $this->config = $config; |
54 | 54 | $this->aimeos = $aimeos; |
@@ -63,23 +63,23 @@ discard block |
||
63 | 63 | * @param string $pageName Name of the configured page |
64 | 64 | * @return array Associative list with body and header output separated by client name |
65 | 65 | */ |
66 | - public function getSections( $pageName ) |
|
66 | + public function getSections($pageName) |
|
67 | 67 | { |
68 | 68 | $context = $this->context->get(); |
69 | 69 | $langid = $context->getLocale()->getLanguageId(); |
70 | - $tmplPaths = $this->aimeos->get()->getCustomPaths( 'client/html/templates' ); |
|
71 | - $view = $this->view->create( $context->getConfig(), $tmplPaths, $langid ); |
|
72 | - $context->setView( $view ); |
|
70 | + $tmplPaths = $this->aimeos->get()->getCustomPaths('client/html/templates'); |
|
71 | + $view = $this->view->create($context->getConfig(), $tmplPaths, $langid); |
|
72 | + $context->setView($view); |
|
73 | 73 | |
74 | - $pagesConfig = $this->config->get( 'shop.page', array() ); |
|
75 | - $result = array( 'aibody' => array(), 'aiheader' => array() ); |
|
74 | + $pagesConfig = $this->config->get('shop.page', array()); |
|
75 | + $result = array('aibody' => array(), 'aiheader' => array()); |
|
76 | 76 | |
77 | - if( isset( $pagesConfig[$pageName] ) ) |
|
77 | + if (isset($pagesConfig[$pageName])) |
|
78 | 78 | { |
79 | - foreach( (array) $pagesConfig[$pageName] as $clientName ) |
|
79 | + foreach ((array) $pagesConfig[$pageName] as $clientName) |
|
80 | 80 | { |
81 | - $client = \Aimeos\Client\Html\Factory::createClient( $context, $tmplPaths, $clientName ); |
|
82 | - $client->setView( clone $view ); |
|
81 | + $client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName); |
|
82 | + $client->setView(clone $view); |
|
83 | 83 | $client->process(); |
84 | 84 | |
85 | 85 | $result['aibody'][$clientName] = $client->getBody(); |
@@ -26,48 +26,48 @@ discard block |
||
26 | 26 | * @param string|null $locale Code of the current language or null for no translation |
27 | 27 | * @return \Aimeos\MW\View\Iface View object |
28 | 28 | */ |
29 | - public function create( \Aimeos\MW\Config\Iface $config, array $templatePaths, $locale = null ) |
|
29 | + public function create(\Aimeos\MW\Config\Iface $config, array $templatePaths, $locale = null) |
|
30 | 30 | { |
31 | 31 | $params = $fixed = array(); |
32 | 32 | |
33 | - if( $locale !== null ) |
|
33 | + if ($locale !== null) |
|
34 | 34 | { |
35 | 35 | $params = \Route::current()->parameters() + \Input::all(); |
36 | 36 | $fixed = $this->getFixedParams(); |
37 | 37 | |
38 | - $i18n = app('\Aimeos\Shop\Base\I18n')->get( array( $locale ) ); |
|
38 | + $i18n = app('\Aimeos\Shop\Base\I18n')->get(array($locale)); |
|
39 | 39 | $translation = $i18n[$locale]; |
40 | 40 | } |
41 | 41 | else |
42 | 42 | { |
43 | - $translation = new \Aimeos\MW\Translation\None( 'en' ); |
|
43 | + $translation = new \Aimeos\MW\Translation\None('en'); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | |
47 | - $view = new \Aimeos\MW\View\Standard( $templatePaths ); |
|
47 | + $view = new \Aimeos\MW\View\Standard($templatePaths); |
|
48 | 48 | |
49 | - $helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation ); |
|
50 | - $view->addHelper( 'translate', $helper ); |
|
49 | + $helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation); |
|
50 | + $view->addHelper('translate', $helper); |
|
51 | 51 | |
52 | - $helper = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, app('url'), $fixed ); |
|
53 | - $view->addHelper( 'url', $helper ); |
|
52 | + $helper = new \Aimeos\MW\View\Helper\Url\Laravel5($view, app('url'), $fixed); |
|
53 | + $view->addHelper('url', $helper); |
|
54 | 54 | |
55 | - $helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params ); |
|
56 | - $view->addHelper( 'param', $helper ); |
|
55 | + $helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params); |
|
56 | + $view->addHelper('param', $helper); |
|
57 | 57 | |
58 | - $helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config ); |
|
59 | - $view->addHelper( 'config', $helper ); |
|
58 | + $helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config); |
|
59 | + $view->addHelper('config', $helper); |
|
60 | 60 | |
61 | - $sepDec = $config->get( 'client/html/common/format/seperatorDecimal', '.' ); |
|
62 | - $sep1000 = $config->get( 'client/html/common/format/seperator1000', ' ' ); |
|
63 | - $helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000 ); |
|
64 | - $view->addHelper( 'number', $helper ); |
|
61 | + $sepDec = $config->get('client/html/common/format/seperatorDecimal', '.'); |
|
62 | + $sep1000 = $config->get('client/html/common/format/seperator1000', ' '); |
|
63 | + $helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000); |
|
64 | + $view->addHelper('number', $helper); |
|
65 | 65 | |
66 | - $helper = new \Aimeos\MW\View\Helper\Request\Laravel5( $view, \Request::instance() ); |
|
67 | - $view->addHelper( 'request', $helper ); |
|
66 | + $helper = new \Aimeos\MW\View\Helper\Request\Laravel5($view, \Request::instance()); |
|
67 | + $view->addHelper('request', $helper); |
|
68 | 68 | |
69 | - $helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', csrf_token() ); |
|
70 | - $view->addHelper( 'csrf', $helper ); |
|
69 | + $helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', csrf_token()); |
|
70 | + $view->addHelper('csrf', $helper); |
|
71 | 71 | |
72 | 72 | return $view; |
73 | 73 | } |
@@ -82,15 +82,15 @@ discard block |
||
82 | 82 | { |
83 | 83 | $fixed = array(); |
84 | 84 | |
85 | - if( ( $value = \Route::input( 'site' ) ) !== null ) { |
|
85 | + if (($value = \Route::input('site')) !== null) { |
|
86 | 86 | $fixed['site'] = $value; |
87 | 87 | } |
88 | 88 | |
89 | - if( ( $value = \Route::input( 'locale' ) ) !== null ) { |
|
89 | + if (($value = \Route::input('locale')) !== null) { |
|
90 | 90 | $fixed['locale'] = $value; |
91 | 91 | } |
92 | 92 | |
93 | - if( ( $value = \Route::input( 'currency' ) ) !== null ) { |
|
93 | + if (($value = \Route::input('currency')) !== null) { |
|
94 | 94 | $fixed['currency'] = $value; |
95 | 95 | } |
96 | 96 |