@@ -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->getConfig(), array(), $langid ); |
|
| 49 | - $context->setView( $view ); |
|
| 48 | + $view = app('\Aimeos\Shop\Base\View')->create($context->getConfig(), 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 |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | * @param \Aimeos\Shop\Base\I18n $i18n I18n object |
| 42 | 42 | * @param \Aimeos\Shop\Base\Support $support Support object |
| 43 | 43 | */ |
| 44 | - public function __construct( \Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support ) |
|
| 44 | + public function __construct(\Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support) |
|
| 45 | 45 | { |
| 46 | 46 | $this->i18n = $i18n; |
| 47 | 47 | $this->support = $support; |
@@ -56,19 +56,19 @@ discard block |
||
| 56 | 56 | * @param string|null $locale Code of the current language or null for no translation |
| 57 | 57 | * @return \Aimeos\MW\View\Iface View object |
| 58 | 58 | */ |
| 59 | - public function create( \Aimeos\MW\Config\Iface $config, array $templatePaths, $locale = null ) |
|
| 59 | + public function create(\Aimeos\MW\Config\Iface $config, array $templatePaths, $locale = null) |
|
| 60 | 60 | { |
| 61 | - $view = new \Aimeos\MW\View\Standard( $templatePaths ); |
|
| 62 | - |
|
| 63 | - $this->addConfig( $view, $config ); |
|
| 64 | - $this->addNumber( $view, $config ); |
|
| 65 | - $this->addRequest( $view ); |
|
| 66 | - $this->addResponse( $view ); |
|
| 67 | - $this->addParam( $view ); |
|
| 68 | - $this->addUrl( $view ); |
|
| 69 | - $this->addCsrf( $view ); |
|
| 70 | - $this->addAccess( $view ); |
|
| 71 | - $this->addTranslate( $view, $config, $locale ); |
|
| 61 | + $view = new \Aimeos\MW\View\Standard($templatePaths); |
|
| 62 | + |
|
| 63 | + $this->addConfig($view, $config); |
|
| 64 | + $this->addNumber($view, $config); |
|
| 65 | + $this->addRequest($view); |
|
| 66 | + $this->addResponse($view); |
|
| 67 | + $this->addParam($view); |
|
| 68 | + $this->addUrl($view); |
|
| 69 | + $this->addCsrf($view); |
|
| 70 | + $this->addAccess($view); |
|
| 71 | + $this->addTranslate($view, $config, $locale); |
|
| 72 | 72 | |
| 73 | 73 | return $view; |
| 74 | 74 | } |
@@ -80,16 +80,16 @@ discard block |
||
| 80 | 80 | * @param \Aimeos\MW\View\Iface $view View object |
| 81 | 81 | * @return \Aimeos\MW\View\Iface Modified view object |
| 82 | 82 | */ |
| 83 | - protected function addAccess( \Aimeos\MW\View\Iface $view ) |
|
| 83 | + protected function addAccess(\Aimeos\MW\View\Iface $view) |
|
| 84 | 84 | { |
| 85 | 85 | $support = $this->support; |
| 86 | 86 | |
| 87 | - $fcn = function() use ( $support ) { |
|
| 87 | + $fcn = function() use ($support) { |
|
| 88 | 88 | return $support->getGroups(); |
| 89 | 89 | }; |
| 90 | 90 | |
| 91 | - $helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn ); |
|
| 92 | - $view->addHelper( 'access', $helper ); |
|
| 91 | + $helper = new \Aimeos\MW\View\Helper\Access\Standard($view, $fcn); |
|
| 92 | + $view->addHelper('access', $helper); |
|
| 93 | 93 | |
| 94 | 94 | return $view; |
| 95 | 95 | } |
@@ -102,11 +102,11 @@ discard block |
||
| 102 | 102 | * @param \Aimeos\MW\Config\Iface $config Configuration object |
| 103 | 103 | * @return \Aimeos\MW\View\Iface Modified view object |
| 104 | 104 | */ |
| 105 | - protected function addConfig( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config ) |
|
| 105 | + protected function addConfig(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config) |
|
| 106 | 106 | { |
| 107 | - $config = new \Aimeos\MW\Config\Decorator\Protect( clone $config, array( 'admin', 'client' ) ); |
|
| 108 | - $helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config ); |
|
| 109 | - $view->addHelper( 'config', $helper ); |
|
| 107 | + $config = new \Aimeos\MW\Config\Decorator\Protect(clone $config, array('admin', 'client')); |
|
| 108 | + $helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config); |
|
| 109 | + $view->addHelper('config', $helper); |
|
| 110 | 110 | |
| 111 | 111 | return $view; |
| 112 | 112 | } |
@@ -118,10 +118,10 @@ discard block |
||
| 118 | 118 | * @param \Aimeos\MW\View\Iface $view View object |
| 119 | 119 | * @return \Aimeos\MW\View\Iface Modified view object |
| 120 | 120 | */ |
| 121 | - protected function addCsrf( \Aimeos\MW\View\Iface $view ) |
|
| 121 | + protected function addCsrf(\Aimeos\MW\View\Iface $view) |
|
| 122 | 122 | { |
| 123 | - $helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', csrf_token() ); |
|
| 124 | - $view->addHelper( 'csrf', $helper ); |
|
| 123 | + $helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', csrf_token()); |
|
| 124 | + $view->addHelper('csrf', $helper); |
|
| 125 | 125 | |
| 126 | 126 | return $view; |
| 127 | 127 | } |
@@ -134,14 +134,14 @@ discard block |
||
| 134 | 134 | * @param \Aimeos\MW\Config\Iface $config Configuration object |
| 135 | 135 | * @return \Aimeos\MW\View\Iface Modified view object |
| 136 | 136 | */ |
| 137 | - protected function addNumber( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config ) |
|
| 137 | + protected function addNumber(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config) |
|
| 138 | 138 | { |
| 139 | - $sepDec = $config->get( 'client/html/common/format/seperatorDecimal', '.' ); |
|
| 140 | - $sep1000 = $config->get( 'client/html/common/format/seperator1000', ' ' ); |
|
| 141 | - $decimals = $config->get( 'client/html/common/format/decimals', 2 ); |
|
| 139 | + $sepDec = $config->get('client/html/common/format/seperatorDecimal', '.'); |
|
| 140 | + $sep1000 = $config->get('client/html/common/format/seperator1000', ' '); |
|
| 141 | + $decimals = $config->get('client/html/common/format/decimals', 2); |
|
| 142 | 142 | |
| 143 | - $helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000, $decimals ); |
|
| 144 | - $view->addHelper( 'number', $helper ); |
|
| 143 | + $helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000, $decimals); |
|
| 144 | + $view->addHelper('number', $helper); |
|
| 145 | 145 | |
| 146 | 146 | return $view; |
| 147 | 147 | } |
@@ -153,11 +153,11 @@ discard block |
||
| 153 | 153 | * @param \Aimeos\MW\View\Iface $view View object |
| 154 | 154 | * @return \Aimeos\MW\View\Iface Modified view object |
| 155 | 155 | */ |
| 156 | - protected static function addParam( \Aimeos\MW\View\Iface $view ) |
|
| 156 | + protected static function addParam(\Aimeos\MW\View\Iface $view) |
|
| 157 | 157 | { |
| 158 | - $params = ( Route::current() ? Route::current()->parameters() + Input::all() : array() ); |
|
| 159 | - $helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params ); |
|
| 160 | - $view->addHelper( 'param', $helper ); |
|
| 158 | + $params = (Route::current() ? Route::current()->parameters() + Input::all() : array()); |
|
| 159 | + $helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params); |
|
| 160 | + $view->addHelper('param', $helper); |
|
| 161 | 161 | |
| 162 | 162 | return $view; |
| 163 | 163 | } |
@@ -169,10 +169,10 @@ discard block |
||
| 169 | 169 | * @param \Aimeos\MW\View\Iface $view View object |
| 170 | 170 | * @return \Aimeos\MW\View\Iface Modified view object |
| 171 | 171 | */ |
| 172 | - protected static function addRequest( \Aimeos\MW\View\Iface $view ) |
|
| 172 | + protected static function addRequest(\Aimeos\MW\View\Iface $view) |
|
| 173 | 173 | { |
| 174 | - $helper = new \Aimeos\MW\View\Helper\Request\Laravel5( $view, Request::instance() ); |
|
| 175 | - $view->addHelper( 'request', $helper ); |
|
| 174 | + $helper = new \Aimeos\MW\View\Helper\Request\Laravel5($view, Request::instance()); |
|
| 175 | + $view->addHelper('request', $helper); |
|
| 176 | 176 | |
| 177 | 177 | return $view; |
| 178 | 178 | } |
@@ -184,10 +184,10 @@ discard block |
||
| 184 | 184 | * @param \Aimeos\MW\View\Iface $view View object |
| 185 | 185 | * @return \Aimeos\MW\View\Iface Modified view object |
| 186 | 186 | */ |
| 187 | - protected static function addResponse( \Aimeos\MW\View\Iface $view ) |
|
| 187 | + protected static function addResponse(\Aimeos\MW\View\Iface $view) |
|
| 188 | 188 | { |
| 189 | - $helper = new \Aimeos\MW\View\Helper\Response\Laravel5( $view ); |
|
| 190 | - $view->addHelper( 'response', $helper ); |
|
| 189 | + $helper = new \Aimeos\MW\View\Helper\Response\Laravel5($view); |
|
| 190 | + $view->addHelper('response', $helper); |
|
| 191 | 191 | |
| 192 | 192 | return $view; |
| 193 | 193 | } |
@@ -199,27 +199,27 @@ discard block |
||
| 199 | 199 | * @param \Aimeos\MW\View\Iface $view View object |
| 200 | 200 | * @return \Aimeos\MW\View\Iface Modified view object |
| 201 | 201 | */ |
| 202 | - protected function addUrl( \Aimeos\MW\View\Iface $view ) |
|
| 202 | + protected function addUrl(\Aimeos\MW\View\Iface $view) |
|
| 203 | 203 | { |
| 204 | 204 | $fixed = array(); |
| 205 | 205 | |
| 206 | - if( Route::current() ) |
|
| 206 | + if (Route::current()) |
|
| 207 | 207 | { |
| 208 | - if( ( $value = Route::input( 'site' ) ) !== null ) { |
|
| 208 | + if (($value = Route::input('site')) !== null) { |
|
| 209 | 209 | $fixed['site'] = $value; |
| 210 | 210 | } |
| 211 | 211 | |
| 212 | - if( ( $value = Route::input( 'locale' ) ) !== null ) { |
|
| 212 | + if (($value = Route::input('locale')) !== null) { |
|
| 213 | 213 | $fixed['locale'] = $value; |
| 214 | 214 | } |
| 215 | 215 | |
| 216 | - if( ( $value = Route::input( 'currency' ) ) !== null ) { |
|
| 216 | + if (($value = Route::input('currency')) !== null) { |
|
| 217 | 217 | $fixed['currency'] = $value; |
| 218 | 218 | } |
| 219 | 219 | } |
| 220 | 220 | |
| 221 | - $helper = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, app('url'), $fixed ); |
|
| 222 | - $view->addHelper( 'url', $helper ); |
|
| 221 | + $helper = new \Aimeos\MW\View\Helper\Url\Laravel5($view, app('url'), $fixed); |
|
| 222 | + $view->addHelper('url', $helper); |
|
| 223 | 223 | |
| 224 | 224 | return $view; |
| 225 | 225 | } |
@@ -233,20 +233,20 @@ discard block |
||
| 233 | 233 | * @param string|null $locale ISO language code, e.g. "de" or "de_CH" |
| 234 | 234 | * @return \Aimeos\MW\View\Iface Modified view object |
| 235 | 235 | */ |
| 236 | - protected function addTranslate( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config, $locale ) |
|
| 236 | + protected function addTranslate(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config, $locale) |
|
| 237 | 237 | { |
| 238 | - if( $locale !== null ) |
|
| 238 | + if ($locale !== null) |
|
| 239 | 239 | { |
| 240 | - $i18n = $this->i18n->get( array( $locale ), $config->get( 'i18n', array() ) ); |
|
| 240 | + $i18n = $this->i18n->get(array($locale), $config->get('i18n', array())); |
|
| 241 | 241 | $translation = $i18n[$locale]; |
| 242 | 242 | } |
| 243 | 243 | else |
| 244 | 244 | { |
| 245 | - $translation = new \Aimeos\MW\Translation\None( 'en' ); |
|
| 245 | + $translation = new \Aimeos\MW\Translation\None('en'); |
|
| 246 | 246 | } |
| 247 | 247 | |
| 248 | - $helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation ); |
|
| 249 | - $view->addHelper( 'translate', $helper ); |
|
| 248 | + $helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation); |
|
| 249 | + $view->addHelper('translate', $helper); |
|
| 250 | 250 | |
| 251 | 251 | return $view; |
| 252 | 252 | } |
@@ -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; |
@@ -34,12 +34,12 @@ discard block |
||
| 34 | 34 | * @param \Aimeos\Shop\Base\Context $context Context provider |
| 35 | 35 | * @param \Aimeos\Shop\Base\Locale $locale Locale provider |
| 36 | 36 | */ |
| 37 | - public function __construct( \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale ) |
|
| 37 | + public function __construct(\Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale) |
|
| 38 | 38 | { |
| 39 | - $site = ( Route::current() ? Route::input( 'site', Input::get( 'site', 'default' ) ) : 'default' ); |
|
| 39 | + $site = (Route::current() ? Route::input('site', Input::get('site', 'default')) : 'default'); |
|
| 40 | 40 | |
| 41 | - $this->context = $context->get( false ); |
|
| 42 | - $this->context->setLocale( $locale->getBackend( $this->context, $site ) ); |
|
| 41 | + $this->context = $context->get(false); |
|
| 42 | + $this->context->setLocale($locale->getBackend($this->context, $site)); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | |
@@ -50,39 +50,39 @@ discard block |
||
| 50 | 50 | * @param string|array $groupcodes Unique user/customer group codes that are allowed |
| 51 | 51 | * @return boolean True if user is part of the group, false if not |
| 52 | 52 | */ |
| 53 | - public function checkGroup( $userid, $groupcodes ) |
|
| 53 | + public function checkGroup($userid, $groupcodes) |
|
| 54 | 54 | { |
| 55 | - $manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer/group' ); |
|
| 55 | + $manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer/group'); |
|
| 56 | 56 | |
| 57 | 57 | $search = $manager->createSearch(); |
| 58 | - $search->setConditions( $search->compare( '==', 'customer.group.code', (array) $groupcodes ) ); |
|
| 59 | - $groupItems = $manager->searchItems( $search ); |
|
| 58 | + $search->setConditions($search->compare('==', 'customer.group.code', (array) $groupcodes)); |
|
| 59 | + $groupItems = $manager->searchItems($search); |
|
| 60 | 60 | |
| 61 | 61 | |
| 62 | - $manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer/lists' ); |
|
| 62 | + $manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer/lists'); |
|
| 63 | 63 | |
| 64 | 64 | $search = $manager->createSearch(); |
| 65 | 65 | $expr = array( |
| 66 | - $search->compare( '==', 'customer.lists.parentid', $userid ), |
|
| 67 | - $search->compare( '==', 'customer.lists.refid', array_keys( $groupItems ) ), |
|
| 68 | - $search->compare( '==', 'customer.lists.domain', 'customer/group' ), |
|
| 66 | + $search->compare('==', 'customer.lists.parentid', $userid), |
|
| 67 | + $search->compare('==', 'customer.lists.refid', array_keys($groupItems)), |
|
| 68 | + $search->compare('==', 'customer.lists.domain', 'customer/group'), |
|
| 69 | 69 | ); |
| 70 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 71 | - $search->setSlice( 0, 1 ); |
|
| 70 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 71 | + $search->setSlice(0, 1); |
|
| 72 | 72 | |
| 73 | - return (bool) count( $manager->searchItems( $search ) ); |
|
| 73 | + return (bool) count($manager->searchItems($search)); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | |
| 77 | 77 | public function getGroups() |
| 78 | 78 | { |
| 79 | 79 | $list = array(); |
| 80 | - $manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer/group' ); |
|
| 80 | + $manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer/group'); |
|
| 81 | 81 | |
| 82 | 82 | $search = $manager->createSearch(); |
| 83 | - $search->setConditions( $search->compare( '==', 'customer.group.id', $this->context->getGroupIds() ) ); |
|
| 83 | + $search->setConditions($search->compare('==', 'customer.group.id', $this->context->getGroupIds())); |
|
| 84 | 84 | |
| 85 | - foreach( $manager->searchItems( $search ) as $item ) { |
|
| 85 | + foreach ($manager->searchItems($search) as $item) { |
|
| 86 | 86 | $list[] = $item->getCode(); |
| 87 | 87 | } |
| 88 | 88 | |
@@ -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 | } |
@@ -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; |
@@ -48,9 +48,9 @@ discard block |
||
| 48 | 48 | * @param \Aimeos\Shop\Base\Locale $locale Locale object |
| 49 | 49 | * @param \Aimeos\Shop\Base\View $view View object |
| 50 | 50 | */ |
| 51 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, |
|
| 51 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, |
|
| 52 | 52 | \Aimeos\Shop\Base\Aimeos $aimeos, \Aimeos\Shop\Base\Context $context, |
| 53 | - \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view ) |
|
| 53 | + \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view) |
|
| 54 | 54 | { |
| 55 | 55 | $this->config = $config; |
| 56 | 56 | $this->aimeos = $aimeos; |
@@ -66,23 +66,23 @@ discard block |
||
| 66 | 66 | * @param string $pageName Name of the configured page |
| 67 | 67 | * @return array Associative list with body and header output separated by client name |
| 68 | 68 | */ |
| 69 | - public function getSections( $pageName ) |
|
| 69 | + public function getSections($pageName) |
|
| 70 | 70 | { |
| 71 | 71 | $context = $this->context->get(); |
| 72 | 72 | $langid = $context->getLocale()->getLanguageId(); |
| 73 | - $tmplPaths = $this->aimeos->get()->getCustomPaths( 'client/html/templates' ); |
|
| 74 | - $view = $this->view->create( $context->getConfig(), $tmplPaths, $langid ); |
|
| 75 | - $context->setView( $view ); |
|
| 73 | + $tmplPaths = $this->aimeos->get()->getCustomPaths('client/html/templates'); |
|
| 74 | + $view = $this->view->create($context->getConfig(), $tmplPaths, $langid); |
|
| 75 | + $context->setView($view); |
|
| 76 | 76 | |
| 77 | - $pagesConfig = $this->config->get( 'shop.page', array() ); |
|
| 78 | - $result = array( 'aibody' => array(), 'aiheader' => array() ); |
|
| 77 | + $pagesConfig = $this->config->get('shop.page', array()); |
|
| 78 | + $result = array('aibody' => array(), 'aiheader' => array()); |
|
| 79 | 79 | |
| 80 | - if( isset( $pagesConfig[$pageName] ) ) |
|
| 80 | + if (isset($pagesConfig[$pageName])) |
|
| 81 | 81 | { |
| 82 | - foreach( (array) $pagesConfig[$pageName] as $clientName ) |
|
| 82 | + foreach ((array) $pagesConfig[$pageName] as $clientName) |
|
| 83 | 83 | { |
| 84 | - $client = \Aimeos\Client\Html\Factory::createClient( $context, $tmplPaths, $clientName ); |
|
| 85 | - $client->setView( clone $view ); |
|
| 84 | + $client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName); |
|
| 85 | + $client->setView(clone $view); |
|
| 86 | 86 | $client->process(); |
| 87 | 87 | |
| 88 | 88 | $result['aibody'][$clientName] = $client->getBody(); |
@@ -35,19 +35,19 @@ discard block |
||
| 35 | 35 | * @param \Illuminate\Http\Request $request Request object |
| 36 | 36 | * @return \Illuminate\Http\Response Response object containing the generated output |
| 37 | 37 | */ |
| 38 | - public function deleteAction( Request $request ) |
|
| 38 | + public function deleteAction(Request $request) |
|
| 39 | 39 | { |
| 40 | - if( config( 'shop.authorize', true ) ) { |
|
| 41 | - $this->authorize( 'admin', [['admin', 'api']] ); |
|
| 40 | + if (config('shop.authorize', true)) { |
|
| 41 | + $this->authorize('admin', [['admin', 'api']]); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | $status = 500; |
| 45 | 45 | $header = $request->headers->all(); |
| 46 | 46 | |
| 47 | 47 | $client = $this->createClient(); |
| 48 | - $result = $client->delete( (string) $request->getContent(), $header, $status ); |
|
| 48 | + $result = $client->delete((string) $request->getContent(), $header, $status); |
|
| 49 | 49 | |
| 50 | - return $this->createResponse( $result, $status, $header ); |
|
| 50 | + return $this->createResponse($result, $status, $header); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | |
@@ -57,19 +57,19 @@ discard block |
||
| 57 | 57 | * @param \Illuminate\Http\Request $request Request object |
| 58 | 58 | * @return \Illuminate\Http\Response Response object containing the generated output |
| 59 | 59 | */ |
| 60 | - public function getAction( Request $request ) |
|
| 60 | + public function getAction(Request $request) |
|
| 61 | 61 | { |
| 62 | - if( config( 'shop.authorize', true ) ) { |
|
| 63 | - $this->authorize( 'admin', [['admin', 'api', 'editor']] ); |
|
| 62 | + if (config('shop.authorize', true)) { |
|
| 63 | + $this->authorize('admin', [['admin', 'api', 'editor']]); |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | $status = 500; |
| 67 | 67 | $header = $request->headers->all(); |
| 68 | 68 | |
| 69 | 69 | $client = $this->createClient(); |
| 70 | - $result = $client->get( (string) $request->getContent(), $header, $status ); |
|
| 70 | + $result = $client->get((string) $request->getContent(), $header, $status); |
|
| 71 | 71 | |
| 72 | - return $this->createResponse( $result, $status, $header ); |
|
| 72 | + return $this->createResponse($result, $status, $header); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | |
@@ -79,19 +79,19 @@ discard block |
||
| 79 | 79 | * @param \Illuminate\Http\Request $request Request object |
| 80 | 80 | * @return \Illuminate\Http\Response Response object containing the generated output |
| 81 | 81 | */ |
| 82 | - public function patchAction( Request $request ) |
|
| 82 | + public function patchAction(Request $request) |
|
| 83 | 83 | { |
| 84 | - if( config( 'shop.authorize', true ) ) { |
|
| 85 | - $this->authorize( 'admin', [['admin', 'api']] ); |
|
| 84 | + if (config('shop.authorize', true)) { |
|
| 85 | + $this->authorize('admin', [['admin', 'api']]); |
|
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | $status = 500; |
| 89 | 89 | $header = $request->headers->all(); |
| 90 | 90 | |
| 91 | 91 | $client = $this->createClient(); |
| 92 | - $result = $client->patch( (string) $request->getContent(), $header, $status ); |
|
| 92 | + $result = $client->patch((string) $request->getContent(), $header, $status); |
|
| 93 | 93 | |
| 94 | - return $this->createResponse( $result, $status, $header ); |
|
| 94 | + return $this->createResponse($result, $status, $header); |
|
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | |
@@ -101,19 +101,19 @@ discard block |
||
| 101 | 101 | * @param \Illuminate\Http\Request $request Request object |
| 102 | 102 | * @return \Illuminate\Http\Response Response object containing the generated output |
| 103 | 103 | */ |
| 104 | - public function postAction( Request $request ) |
|
| 104 | + public function postAction(Request $request) |
|
| 105 | 105 | { |
| 106 | - if( config( 'shop.authorize', true ) ) { |
|
| 107 | - $this->authorize( 'admin', [['admin', 'api']] ); |
|
| 106 | + if (config('shop.authorize', true)) { |
|
| 107 | + $this->authorize('admin', [['admin', 'api']]); |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | $status = 500; |
| 111 | 111 | $header = $request->headers->all(); |
| 112 | 112 | |
| 113 | 113 | $client = $this->createClient(); |
| 114 | - $result = $client->post( (string) $request->getContent(), $header, $status ); |
|
| 114 | + $result = $client->post((string) $request->getContent(), $header, $status); |
|
| 115 | 115 | |
| 116 | - return $this->createResponse( $result, $status, $header ); |
|
| 116 | + return $this->createResponse($result, $status, $header); |
|
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | |
@@ -123,19 +123,19 @@ discard block |
||
| 123 | 123 | * @param \Illuminate\Http\Request $request Request object |
| 124 | 124 | * @return \Illuminate\Http\Response Response object containing the generated output |
| 125 | 125 | */ |
| 126 | - public function putAction( Request $request ) |
|
| 126 | + public function putAction(Request $request) |
|
| 127 | 127 | { |
| 128 | - if( config( 'shop.authorize', true ) ) { |
|
| 129 | - $this->authorize( 'admin', [['admin', 'api']] ); |
|
| 128 | + if (config('shop.authorize', true)) { |
|
| 129 | + $this->authorize('admin', [['admin', 'api']]); |
|
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | $status = 500; |
| 133 | 133 | $header = $request->headers->all(); |
| 134 | 134 | |
| 135 | 135 | $client = $this->createClient(); |
| 136 | - $result = $client->put( (string) $request->getContent(), $header, $status ); |
|
| 136 | + $result = $client->put((string) $request->getContent(), $header, $status); |
|
| 137 | 137 | |
| 138 | - return $this->createResponse( $result, $status, $header ); |
|
| 138 | + return $this->createResponse($result, $status, $header); |
|
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | |
@@ -145,19 +145,19 @@ discard block |
||
| 145 | 145 | * @param \Illuminate\Http\Request $request Request object |
| 146 | 146 | * @return \Illuminate\Http\Response Response object containing the generated output |
| 147 | 147 | */ |
| 148 | - public function optionsAction( Request $request ) |
|
| 148 | + public function optionsAction(Request $request) |
|
| 149 | 149 | { |
| 150 | - if( config( 'shop.authorize', true ) ) { |
|
| 151 | - $this->authorize( 'admin', [['admin', 'api', 'editor']] ); |
|
| 150 | + if (config('shop.authorize', true)) { |
|
| 151 | + $this->authorize('admin', [['admin', 'api', 'editor']]); |
|
| 152 | 152 | } |
| 153 | 153 | |
| 154 | 154 | $status = 500; |
| 155 | 155 | $header = $request->headers->all(); |
| 156 | 156 | |
| 157 | 157 | $client = $this->createClient(); |
| 158 | - $result = $client->options( (string) $request->getContent(), $header, $status ); |
|
| 158 | + $result = $client->options((string) $request->getContent(), $header, $status); |
|
| 159 | 159 | |
| 160 | - return $this->createResponse( $result, $status, $header ); |
|
| 160 | + return $this->createResponse($result, $status, $header); |
|
| 161 | 161 | } |
| 162 | 162 | |
| 163 | 163 | |
@@ -168,19 +168,19 @@ discard block |
||
| 168 | 168 | */ |
| 169 | 169 | protected function createClient() |
| 170 | 170 | { |
| 171 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); |
|
| 172 | - $lang = Input::get( 'lang', config( 'app.locale', 'en' ) ); |
|
| 173 | - $resource = Route::input( 'resource' ); |
|
| 171 | + $site = Route::input('site', Input::get('site', 'default')); |
|
| 172 | + $lang = Input::get('lang', config('app.locale', 'en')); |
|
| 173 | + $resource = Route::input('resource'); |
|
| 174 | 174 | |
| 175 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
| 176 | - $templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' ); |
|
| 175 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
| 176 | + $templatePaths = $aimeos->getCustomPaths('admin/jsonadm/templates'); |
|
| 177 | 177 | |
| 178 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' ); |
|
| 179 | - $context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang, 'en' ) ) ); |
|
| 180 | - $context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) ); |
|
| 181 | - $context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context->getConfig(), $templatePaths, $lang ) ); |
|
| 178 | + $context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend'); |
|
| 179 | + $context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en'))); |
|
| 180 | + $context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site)); |
|
| 181 | + $context->setView(app('\Aimeos\Shop\Base\View')->create($context->getConfig(), $templatePaths, $lang)); |
|
| 182 | 182 | |
| 183 | - return \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, $resource ); |
|
| 183 | + return \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, $resource); |
|
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | |
@@ -192,12 +192,12 @@ discard block |
||
| 192 | 192 | * @param array $header List of HTTP headers |
| 193 | 193 | * @return \Illuminate\Http\Response HTTP response object |
| 194 | 194 | */ |
| 195 | - protected function createResponse( $content, $status, array $header ) |
|
| 195 | + protected function createResponse($content, $status, array $header) |
|
| 196 | 196 | { |
| 197 | - $response = Response::make( $content, $status ); |
|
| 197 | + $response = Response::make($content, $status); |
|
| 198 | 198 | |
| 199 | - foreach( $header as $key => $value ) { |
|
| 200 | - $response->header( $key, $value ); |
|
| 199 | + foreach ($header as $key => $value) { |
|
| 200 | + $response->header($key, $value); |
|
| 201 | 201 | } |
| 202 | 202 | |
| 203 | 203 | return $response; |