@@ -196,8 +196,7 @@ |
||
| 196 | 196 | try |
| 197 | 197 | { |
| 198 | 198 | $item = $manager->findItem( $code ); |
| 199 | - } |
|
| 200 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 199 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 201 | 200 | { |
| 202 | 201 | $item = $manager->createItem(); |
| 203 | 202 | $item->setLabel( $code ); |
@@ -43,30 +43,30 @@ discard block |
||
| 43 | 43 | */ |
| 44 | 44 | public function fire() |
| 45 | 45 | { |
| 46 | - $code = $this->argument( 'email' ); |
|
| 47 | - if( ( $password = $this->option( 'password' ) ) === null ) { |
|
| 48 | - $password = $this->secret( 'Password' ); |
|
| 46 | + $code = $this->argument('email'); |
|
| 47 | + if (($password = $this->option('password')) === null) { |
|
| 48 | + $password = $this->secret('Password'); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | - $context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false, 'command' ); |
|
| 52 | - $context->setEditor( 'aimeos:account' ); |
|
| 51 | + $context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false, 'command'); |
|
| 52 | + $context->setEditor('aimeos:account'); |
|
| 53 | 53 | |
| 54 | - $localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' ); |
|
| 55 | - $localeItem = $localeManager->bootstrap( $this->argument( 'site' ), '', '', false ); |
|
| 56 | - $context->setLocale( $localeItem ); |
|
| 54 | + $localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale'); |
|
| 55 | + $localeItem = $localeManager->bootstrap($this->argument('site'), '', '', false); |
|
| 56 | + $context->setLocale($localeItem); |
|
| 57 | 57 | |
| 58 | - $user = $this->createCustomerItem( $context, $code, $password ); |
|
| 58 | + $user = $this->createCustomerItem($context, $code, $password); |
|
| 59 | 59 | |
| 60 | - if( $this->option( 'admin' ) ) { |
|
| 61 | - $this->addGroup( $context, $user, 'admin' ); |
|
| 60 | + if ($this->option('admin')) { |
|
| 61 | + $this->addGroup($context, $user, 'admin'); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - if( $this->option( 'api' ) ) { |
|
| 65 | - $this->addGroup( $context, $user, 'api' ); |
|
| 64 | + if ($this->option('api')) { |
|
| 65 | + $this->addGroup($context, $user, 'api'); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - if( $this->option( 'editor' ) ) { |
|
| 69 | - $this->addGroup( $context, $user, 'editor' ); |
|
| 68 | + if ($this->option('editor')) { |
|
| 69 | + $this->addGroup($context, $user, 'editor'); |
|
| 70 | 70 | } |
| 71 | 71 | } |
| 72 | 72 | |
@@ -78,33 +78,33 @@ discard block |
||
| 78 | 78 | * @param string $userid Unique user ID |
| 79 | 79 | * @param string $groupid Unique group ID |
| 80 | 80 | */ |
| 81 | - protected function addListItem( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid ) |
|
| 81 | + protected function addListItem(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid) |
|
| 82 | 82 | { |
| 83 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' ); |
|
| 84 | - $typeManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists/type' ); |
|
| 83 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists'); |
|
| 84 | + $typeManager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists/type'); |
|
| 85 | 85 | |
| 86 | - $typeid = $typeManager->findItem( 'default', array(), 'customer/group' )->getId(); |
|
| 86 | + $typeid = $typeManager->findItem('default', array(), 'customer/group')->getId(); |
|
| 87 | 87 | |
| 88 | 88 | $search = $manager->createSearch(); |
| 89 | 89 | $expr = array( |
| 90 | - $search->compare( '==', 'customer.lists.parentid', $userid ), |
|
| 91 | - $search->compare( '==', 'customer.lists.refid', $groupid ), |
|
| 92 | - $search->compare( '==', 'customer.lists.domain', 'customer/group' ), |
|
| 93 | - $search->compare( '==', 'customer.lists.typeid', $typeid ), |
|
| 90 | + $search->compare('==', 'customer.lists.parentid', $userid), |
|
| 91 | + $search->compare('==', 'customer.lists.refid', $groupid), |
|
| 92 | + $search->compare('==', 'customer.lists.domain', 'customer/group'), |
|
| 93 | + $search->compare('==', 'customer.lists.typeid', $typeid), |
|
| 94 | 94 | ); |
| 95 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 96 | - $search->setSlice( 0, 1 ); |
|
| 95 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 96 | + $search->setSlice(0, 1); |
|
| 97 | 97 | |
| 98 | - if( count( $manager->searchItems( $search ) ) === 0 ) |
|
| 98 | + if (count($manager->searchItems($search)) === 0) |
|
| 99 | 99 | { |
| 100 | 100 | $item = $manager->createItem(); |
| 101 | - $item->setDomain( 'customer/group' ); |
|
| 102 | - $item->setParentId( $userid ); |
|
| 103 | - $item->setTypeId( $typeid ); |
|
| 104 | - $item->setRefId( $groupid ); |
|
| 105 | - $item->setStatus( 1 ); |
|
| 101 | + $item->setDomain('customer/group'); |
|
| 102 | + $item->setParentId($userid); |
|
| 103 | + $item->setTypeId($typeid); |
|
| 104 | + $item->setRefId($groupid); |
|
| 105 | + $item->setStatus(1); |
|
| 106 | 106 | |
| 107 | - $manager->saveItem( $item, false ); |
|
| 107 | + $manager->saveItem($item, false); |
|
| 108 | 108 | } |
| 109 | 109 | } |
| 110 | 110 | |
@@ -116,13 +116,13 @@ discard block |
||
| 116 | 116 | * @param \Aimeos\MShop\Customer\Item\Iface $user Aimeos customer object |
| 117 | 117 | * @param string $group Unique customer group code |
| 118 | 118 | */ |
| 119 | - protected function addGroup( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group ) |
|
| 119 | + protected function addGroup(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group) |
|
| 120 | 120 | { |
| 121 | 121 | $msg = 'Add "%1$s" group to user "%2$s" for site "%3$s"'; |
| 122 | - $this->info( sprintf( $msg, $group, $user->getCode(), $this->argument( 'site' ) ) ); |
|
| 122 | + $this->info(sprintf($msg, $group, $user->getCode(), $this->argument('site'))); |
|
| 123 | 123 | |
| 124 | - $groupItem = $this->getGroupItem( $context, $group ); |
|
| 125 | - $this->addListItem( $context, $user->getId(), $groupItem->getId() ); |
|
| 124 | + $groupItem = $this->getGroupItem($context, $group); |
|
| 125 | + $this->addListItem($context, $user->getId(), $groupItem->getId()); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | |
@@ -136,23 +136,23 @@ discard block |
||
| 136 | 136 | * @param string $password New user password |
| 137 | 137 | * @return \Aimeos\MShop\Customer\Item\Iface Aimeos customer item object |
| 138 | 138 | */ |
| 139 | - protected function createCustomerItem( \Aimeos\MShop\Context\Item\Iface $context, $email, $password ) |
|
| 139 | + protected function createCustomerItem(\Aimeos\MShop\Context\Item\Iface $context, $email, $password) |
|
| 140 | 140 | { |
| 141 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' ); |
|
| 141 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer'); |
|
| 142 | 142 | |
| 143 | 143 | try { |
| 144 | - $item = $manager->findItem( $email ); |
|
| 145 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
| 144 | + $item = $manager->findItem($email); |
|
| 145 | + } catch (\Aimeos\MShop\Exception $e) { |
|
| 146 | 146 | $item = $manager->createItem(); |
| 147 | 147 | } |
| 148 | 148 | |
| 149 | - $item->setCode( $email ); |
|
| 150 | - $item->setLabel( $email ); |
|
| 151 | - $item->getPaymentAddress()->setEmail( $email ); |
|
| 152 | - $item->setPassword( $password ); |
|
| 153 | - $item->setStatus( 1 ); |
|
| 149 | + $item->setCode($email); |
|
| 150 | + $item->setLabel($email); |
|
| 151 | + $item->getPaymentAddress()->setEmail($email); |
|
| 152 | + $item->setPassword($password); |
|
| 153 | + $item->setStatus(1); |
|
| 154 | 154 | |
| 155 | - $manager->saveItem( $item ); |
|
| 155 | + $manager->saveItem($item); |
|
| 156 | 156 | |
| 157 | 157 | return $item; |
| 158 | 158 | } |
@@ -166,8 +166,8 @@ discard block |
||
| 166 | 166 | protected function getArguments() |
| 167 | 167 | { |
| 168 | 168 | return array( |
| 169 | - array( 'email', InputArgument::REQUIRED, 'E-mail address of the account that should be created' ), |
|
| 170 | - array( 'site', InputArgument::OPTIONAL, 'Site code to create the account for', 'default' ), |
|
| 169 | + array('email', InputArgument::REQUIRED, 'E-mail address of the account that should be created'), |
|
| 170 | + array('site', InputArgument::OPTIONAL, 'Site code to create the account for', 'default'), |
|
| 171 | 171 | ); |
| 172 | 172 | } |
| 173 | 173 | |
@@ -179,21 +179,21 @@ discard block |
||
| 179 | 179 | * @param string $code Unique customer group code |
| 180 | 180 | * @return \Aimeos\MShop\Customer\Item\Group\Iface Aimeos customer group item object |
| 181 | 181 | */ |
| 182 | - protected function getGroupItem( \Aimeos\MShop\Context\Item\Iface $context, $code ) |
|
| 182 | + protected function getGroupItem(\Aimeos\MShop\Context\Item\Iface $context, $code) |
|
| 183 | 183 | { |
| 184 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'group' ); |
|
| 184 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('group'); |
|
| 185 | 185 | |
| 186 | 186 | try |
| 187 | 187 | { |
| 188 | - $item = $manager->findItem( $code ); |
|
| 188 | + $item = $manager->findItem($code); |
|
| 189 | 189 | } |
| 190 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 190 | + catch (\Aimeos\MShop\Exception $e) |
|
| 191 | 191 | { |
| 192 | 192 | $item = $manager->createItem(); |
| 193 | - $item->setLabel( $code ); |
|
| 194 | - $item->setCode( $code ); |
|
| 193 | + $item->setLabel($code); |
|
| 194 | + $item->setCode($code); |
|
| 195 | 195 | |
| 196 | - $manager->saveItem( $item ); |
|
| 196 | + $manager->saveItem($item); |
|
| 197 | 197 | } |
| 198 | 198 | |
| 199 | 199 | return $item; |
@@ -208,10 +208,10 @@ discard block |
||
| 208 | 208 | protected function getOptions() |
| 209 | 209 | { |
| 210 | 210 | return array( |
| 211 | - array( 'password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)' ), |
|
| 212 | - array( 'admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges' ), |
|
| 213 | - array( 'api', null, InputOption::VALUE_NONE, 'If account should be able to access the APIs' ), |
|
| 214 | - array( 'editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges' ), |
|
| 211 | + array('password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)'), |
|
| 212 | + array('admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges'), |
|
| 213 | + array('api', null, InputOption::VALUE_NONE, 'If account should be able to access the APIs'), |
|
| 214 | + array('editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges'), |
|
| 215 | 215 | ); |
| 216 | 216 | } |
| 217 | 217 | } |
@@ -209,8 +209,7 @@ |
||
| 209 | 209 | { |
| 210 | 210 | $i18n = $this->i18n->get( array( $locale ) ); |
| 211 | 211 | $translation = $i18n[$locale]; |
| 212 | - } |
|
| 213 | - else |
|
| 212 | + } else |
|
| 214 | 213 | { |
| 215 | 214 | $translation = new \Aimeos\MW\Translation\None( 'en' ); |
| 216 | 215 | } |
@@ -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,21 +56,21 @@ 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\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null ) |
|
| 59 | + public function create(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null) |
|
| 60 | 60 | { |
| 61 | - $engine = new \Aimeos\MW\View\Engine\Blade( app( 'Illuminate\Contracts\View\Factory' ) ); |
|
| 62 | - $view = new \Aimeos\MW\View\Standard( $templatePaths, array( '.blade.php' => $engine ) ); |
|
| 61 | + $engine = new \Aimeos\MW\View\Engine\Blade(app('Illuminate\Contracts\View\Factory')); |
|
| 62 | + $view = new \Aimeos\MW\View\Standard($templatePaths, array('.blade.php' => $engine)); |
|
| 63 | 63 | $config = $context->getConfig(); |
| 64 | 64 | |
| 65 | - $this->addCsrf( $view ); |
|
| 66 | - $this->addAccess( $view, $context ); |
|
| 67 | - $this->addConfig( $view, $config ); |
|
| 68 | - $this->addNumber( $view, $config ); |
|
| 69 | - $this->addParam( $view ); |
|
| 70 | - $this->addRequest( $view ); |
|
| 71 | - $this->addResponse( $view ); |
|
| 72 | - $this->addTranslate( $view, $locale ); |
|
| 73 | - $this->addUrl( $view ); |
|
| 65 | + $this->addCsrf($view); |
|
| 66 | + $this->addAccess($view, $context); |
|
| 67 | + $this->addConfig($view, $config); |
|
| 68 | + $this->addNumber($view, $config); |
|
| 69 | + $this->addParam($view); |
|
| 70 | + $this->addRequest($view); |
|
| 71 | + $this->addResponse($view); |
|
| 72 | + $this->addTranslate($view, $locale); |
|
| 73 | + $this->addUrl($view); |
|
| 74 | 74 | |
| 75 | 75 | return $view; |
| 76 | 76 | } |
@@ -83,16 +83,16 @@ discard block |
||
| 83 | 83 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 84 | 84 | * @return \Aimeos\MW\View\Iface Modified view object |
| 85 | 85 | */ |
| 86 | - protected function addAccess( \Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 86 | + protected function addAccess(\Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context) |
|
| 87 | 87 | { |
| 88 | 88 | $support = $this->support; |
| 89 | 89 | |
| 90 | - $fcn = function() use ( $support, $context ) { |
|
| 91 | - return $support->getGroups( $context ); |
|
| 90 | + $fcn = function() use ($support, $context) { |
|
| 91 | + return $support->getGroups($context); |
|
| 92 | 92 | }; |
| 93 | 93 | |
| 94 | - $helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn ); |
|
| 95 | - $view->addHelper( 'access', $helper ); |
|
| 94 | + $helper = new \Aimeos\MW\View\Helper\Access\Standard($view, $fcn); |
|
| 95 | + $view->addHelper('access', $helper); |
|
| 96 | 96 | |
| 97 | 97 | return $view; |
| 98 | 98 | } |
@@ -105,11 +105,11 @@ discard block |
||
| 105 | 105 | * @param \Aimeos\MW\Config\Iface $config Configuration object |
| 106 | 106 | * @return \Aimeos\MW\View\Iface Modified view object |
| 107 | 107 | */ |
| 108 | - protected function addConfig( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config ) |
|
| 108 | + protected function addConfig(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config) |
|
| 109 | 109 | { |
| 110 | - $config = new \Aimeos\MW\Config\Decorator\Protect( clone $config, array( 'admin', 'client' ) ); |
|
| 111 | - $helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config ); |
|
| 112 | - $view->addHelper( 'config', $helper ); |
|
| 110 | + $config = new \Aimeos\MW\Config\Decorator\Protect(clone $config, array('admin', 'client')); |
|
| 111 | + $helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config); |
|
| 112 | + $view->addHelper('config', $helper); |
|
| 113 | 113 | |
| 114 | 114 | return $view; |
| 115 | 115 | } |
@@ -121,10 +121,10 @@ discard block |
||
| 121 | 121 | * @param \Aimeos\MW\View\Iface $view View object |
| 122 | 122 | * @return \Aimeos\MW\View\Iface Modified view object |
| 123 | 123 | */ |
| 124 | - protected function addCsrf( \Aimeos\MW\View\Iface $view ) |
|
| 124 | + protected function addCsrf(\Aimeos\MW\View\Iface $view) |
|
| 125 | 125 | { |
| 126 | - $helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', csrf_token() ); |
|
| 127 | - $view->addHelper( 'csrf', $helper ); |
|
| 126 | + $helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', csrf_token()); |
|
| 127 | + $view->addHelper('csrf', $helper); |
|
| 128 | 128 | |
| 129 | 129 | return $view; |
| 130 | 130 | } |
@@ -137,14 +137,14 @@ discard block |
||
| 137 | 137 | * @param \Aimeos\MW\Config\Iface $config Configuration object |
| 138 | 138 | * @return \Aimeos\MW\View\Iface Modified view object |
| 139 | 139 | */ |
| 140 | - protected function addNumber( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config ) |
|
| 140 | + protected function addNumber(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config) |
|
| 141 | 141 | { |
| 142 | - $sepDec = $config->get( 'client/html/common/format/separatorDecimal', '.' ); |
|
| 143 | - $sep1000 = $config->get( 'client/html/common/format/separator1000', ' ' ); |
|
| 144 | - $decimals = $config->get( 'client/html/common/format/decimals', 2 ); |
|
| 142 | + $sepDec = $config->get('client/html/common/format/separatorDecimal', '.'); |
|
| 143 | + $sep1000 = $config->get('client/html/common/format/separator1000', ' '); |
|
| 144 | + $decimals = $config->get('client/html/common/format/decimals', 2); |
|
| 145 | 145 | |
| 146 | - $helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000, $decimals ); |
|
| 147 | - $view->addHelper( 'number', $helper ); |
|
| 146 | + $helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000, $decimals); |
|
| 147 | + $view->addHelper('number', $helper); |
|
| 148 | 148 | |
| 149 | 149 | return $view; |
| 150 | 150 | } |
@@ -156,11 +156,11 @@ discard block |
||
| 156 | 156 | * @param \Aimeos\MW\View\Iface $view View object |
| 157 | 157 | * @return \Aimeos\MW\View\Iface Modified view object |
| 158 | 158 | */ |
| 159 | - protected function addParam( \Aimeos\MW\View\Iface $view ) |
|
| 159 | + protected function addParam(\Aimeos\MW\View\Iface $view) |
|
| 160 | 160 | { |
| 161 | - $params = ( Route::current() ? Route::current()->parameters() : array() ) + Input::all(); |
|
| 162 | - $helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params ); |
|
| 163 | - $view->addHelper( 'param', $helper ); |
|
| 161 | + $params = (Route::current() ? Route::current()->parameters() : array()) + Input::all(); |
|
| 162 | + $helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params); |
|
| 163 | + $view->addHelper('param', $helper); |
|
| 164 | 164 | |
| 165 | 165 | return $view; |
| 166 | 166 | } |
@@ -172,10 +172,10 @@ discard block |
||
| 172 | 172 | * @param \Aimeos\MW\View\Iface $view View object |
| 173 | 173 | * @return \Aimeos\MW\View\Iface Modified view object |
| 174 | 174 | */ |
| 175 | - protected function addRequest( \Aimeos\MW\View\Iface $view ) |
|
| 175 | + protected function addRequest(\Aimeos\MW\View\Iface $view) |
|
| 176 | 176 | { |
| 177 | - $helper = new \Aimeos\MW\View\Helper\Request\Laravel5( $view, Request::instance() ); |
|
| 178 | - $view->addHelper( 'request', $helper ); |
|
| 177 | + $helper = new \Aimeos\MW\View\Helper\Request\Laravel5($view, Request::instance()); |
|
| 178 | + $view->addHelper('request', $helper); |
|
| 179 | 179 | |
| 180 | 180 | return $view; |
| 181 | 181 | } |
@@ -187,10 +187,10 @@ discard block |
||
| 187 | 187 | * @param \Aimeos\MW\View\Iface $view View object |
| 188 | 188 | * @return \Aimeos\MW\View\Iface Modified view object |
| 189 | 189 | */ |
| 190 | - protected function addResponse( \Aimeos\MW\View\Iface $view ) |
|
| 190 | + protected function addResponse(\Aimeos\MW\View\Iface $view) |
|
| 191 | 191 | { |
| 192 | - $helper = new \Aimeos\MW\View\Helper\Response\Laravel5( $view ); |
|
| 193 | - $view->addHelper( 'response', $helper ); |
|
| 192 | + $helper = new \Aimeos\MW\View\Helper\Response\Laravel5($view); |
|
| 193 | + $view->addHelper('response', $helper); |
|
| 194 | 194 | |
| 195 | 195 | return $view; |
| 196 | 196 | } |
@@ -203,20 +203,20 @@ discard block |
||
| 203 | 203 | * @param string|null $locale ISO language code, e.g. "de" or "de_CH" |
| 204 | 204 | * @return \Aimeos\MW\View\Iface Modified view object |
| 205 | 205 | */ |
| 206 | - protected function addTranslate( \Aimeos\MW\View\Iface $view, $locale ) |
|
| 206 | + protected function addTranslate(\Aimeos\MW\View\Iface $view, $locale) |
|
| 207 | 207 | { |
| 208 | - if( $locale !== null ) |
|
| 208 | + if ($locale !== null) |
|
| 209 | 209 | { |
| 210 | - $i18n = $this->i18n->get( array( $locale ) ); |
|
| 210 | + $i18n = $this->i18n->get(array($locale)); |
|
| 211 | 211 | $translation = $i18n[$locale]; |
| 212 | 212 | } |
| 213 | 213 | else |
| 214 | 214 | { |
| 215 | - $translation = new \Aimeos\MW\Translation\None( 'en' ); |
|
| 215 | + $translation = new \Aimeos\MW\Translation\None('en'); |
|
| 216 | 216 | } |
| 217 | 217 | |
| 218 | - $helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation ); |
|
| 219 | - $view->addHelper( 'translate', $helper ); |
|
| 218 | + $helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation); |
|
| 219 | + $view->addHelper('translate', $helper); |
|
| 220 | 220 | |
| 221 | 221 | return $view; |
| 222 | 222 | } |
@@ -228,27 +228,27 @@ discard block |
||
| 228 | 228 | * @param \Aimeos\MW\View\Iface $view View object |
| 229 | 229 | * @return \Aimeos\MW\View\Iface Modified view object |
| 230 | 230 | */ |
| 231 | - protected function addUrl( \Aimeos\MW\View\Iface $view ) |
|
| 231 | + protected function addUrl(\Aimeos\MW\View\Iface $view) |
|
| 232 | 232 | { |
| 233 | 233 | $fixed = array(); |
| 234 | 234 | |
| 235 | - if( Route::current() ) |
|
| 235 | + if (Route::current()) |
|
| 236 | 236 | { |
| 237 | - if( ( $value = Route::input( 'site' ) ) !== null ) { |
|
| 237 | + if (($value = Route::input('site')) !== null) { |
|
| 238 | 238 | $fixed['site'] = $value; |
| 239 | 239 | } |
| 240 | 240 | |
| 241 | - if( ( $value = Route::input( 'locale' ) ) !== null ) { |
|
| 241 | + if (($value = Route::input('locale')) !== null) { |
|
| 242 | 242 | $fixed['locale'] = $value; |
| 243 | 243 | } |
| 244 | 244 | |
| 245 | - if( ( $value = Route::input( 'currency' ) ) !== null ) { |
|
| 245 | + if (($value = Route::input('currency')) !== null) { |
|
| 246 | 246 | $fixed['currency'] = $value; |
| 247 | 247 | } |
| 248 | 248 | } |
| 249 | 249 | |
| 250 | - $helper = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, app('url'), $fixed ); |
|
| 251 | - $view->addHelper( 'url', $helper ); |
|
| 250 | + $helper = new \Aimeos\MW\View\Helper\Url\Laravel5($view, app('url'), $fixed); |
|
| 251 | + $view->addHelper('url', $helper); |
|
| 252 | 252 | |
| 253 | 253 | return $view; |
| 254 | 254 | } |
@@ -53,9 +53,9 @@ discard block |
||
| 53 | 53 | * @param \Aimeos\Shop\Base\Locale $locale Locale object |
| 54 | 54 | * @param \Aimeos\Shop\Base\View $view View object |
| 55 | 55 | */ |
| 56 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, |
|
| 56 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, |
|
| 57 | 57 | \Aimeos\Shop\Base\Aimeos $aimeos, \Aimeos\Shop\Base\Context $context, |
| 58 | - \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view ) |
|
| 58 | + \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view) |
|
| 59 | 59 | { |
| 60 | 60 | $this->config = $config; |
| 61 | 61 | $this->aimeos = $aimeos; |
@@ -71,21 +71,21 @@ discard block |
||
| 71 | 71 | * @param string $pageName Name of the configured page |
| 72 | 72 | * @return array Associative list with body and header output separated by client name |
| 73 | 73 | */ |
| 74 | - public function getSections( $pageName ) |
|
| 74 | + public function getSections($pageName) |
|
| 75 | 75 | { |
| 76 | 76 | $context = $this->context->get(); |
| 77 | 77 | $langid = $context->getLocale()->getLanguageId(); |
| 78 | - $tmplPaths = $this->aimeos->get()->getCustomPaths( 'client/html/templates' ); |
|
| 79 | - $view = $this->view->create( $context, $tmplPaths, $langid ); |
|
| 80 | - $context->setView( $view ); |
|
| 78 | + $tmplPaths = $this->aimeos->get()->getCustomPaths('client/html/templates'); |
|
| 79 | + $view = $this->view->create($context, $tmplPaths, $langid); |
|
| 80 | + $context->setView($view); |
|
| 81 | 81 | |
| 82 | - $result = array( 'aibody' => array(), 'aiheader' => array() ); |
|
| 83 | - $page = $context->getConfig()->get( 'page/' . $pageName, array() ); |
|
| 82 | + $result = array('aibody' => array(), 'aiheader' => array()); |
|
| 83 | + $page = $context->getConfig()->get('page/'.$pageName, array()); |
|
| 84 | 84 | |
| 85 | - foreach( (array) $page as $clientName ) |
|
| 85 | + foreach ((array) $page as $clientName) |
|
| 86 | 86 | { |
| 87 | - $client = \Aimeos\Client\Html\Factory::createClient( $context, $tmplPaths, $clientName ); |
|
| 88 | - $client->setView( clone $view ); |
|
| 87 | + $client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName); |
|
| 88 | + $client->setView(clone $view); |
|
| 89 | 89 | $client->process(); |
| 90 | 90 | |
| 91 | 91 | $result['aibody'][$clientName] = $client->getBody(); |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | * |
| 35 | 35 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object |
| 36 | 36 | */ |
| 37 | - public function __construct( \Illuminate\Contracts\Config\Repository $config ) |
|
| 37 | + public function __construct(\Illuminate\Contracts\Config\Repository $config) |
|
| 38 | 38 | { |
| 39 | 39 | $this->config = $config; |
| 40 | 40 | } |
@@ -47,16 +47,16 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | public function get() |
| 49 | 49 | { |
| 50 | - if( $this->object === null ) |
|
| 50 | + if ($this->object === null) |
|
| 51 | 51 | { |
| 52 | - $dir = base_path( 'ext' ); |
|
| 52 | + $dir = base_path('ext'); |
|
| 53 | 53 | |
| 54 | - if( !is_dir( $dir ) ) { |
|
| 55 | - $dir = dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . DIRECTORY_SEPARATOR . 'ext'; |
|
| 54 | + if (!is_dir($dir)) { |
|
| 55 | + $dir = dirname(dirname(dirname(dirname(__DIR__)))).DIRECTORY_SEPARATOR.'ext'; |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - $extDirs = (array) $this->config->get( 'shop.extdir', $dir ); |
|
| 59 | - $this->object = new \Aimeos\Bootstrap( $extDirs, false ); |
|
| 58 | + $extDirs = (array) $this->config->get('shop.extdir', $dir); |
|
| 59 | + $this->object = new \Aimeos\Bootstrap($extDirs, false); |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | return $this->object; |
@@ -70,12 +70,12 @@ discard block |
||
| 70 | 70 | */ |
| 71 | 71 | public function getVersion() |
| 72 | 72 | { |
| 73 | - if( ( $content = @file_get_contents( base_path( 'composer.lock' ) ) ) !== false |
|
| 74 | - && ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] ) |
|
| 73 | + if (($content = @file_get_contents(base_path('composer.lock'))) !== false |
|
| 74 | + && ($content = json_decode($content, true)) !== null && isset($content['packages']) |
|
| 75 | 75 | ) { |
| 76 | - foreach( (array) $content['packages'] as $item ) |
|
| 76 | + foreach ((array) $content['packages'] as $item) |
|
| 77 | 77 | { |
| 78 | - if( $item['name'] === 'aimeos/aimeos-laravel' ) { |
|
| 78 | + if ($item['name'] === 'aimeos/aimeos-laravel') { |
|
| 79 | 79 | return $item['version']; |
| 80 | 80 | } |
| 81 | 81 | } |
@@ -8,16 +8,16 @@ discard block |
||
| 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 | ), |
@@ -36,13 +36,13 @@ discard block |
||
| 36 | 36 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
| 37 | 37 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
| 38 | 38 | */ |
| 39 | - public function deleteAction( ServerRequestInterface $request ) |
|
| 39 | + public function deleteAction(ServerRequestInterface $request) |
|
| 40 | 40 | { |
| 41 | - if( config( 'shop.authorize', true ) ) { |
|
| 42 | - $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] ); |
|
| 41 | + if (config('shop.authorize', true)) { |
|
| 42 | + $this->authorize('admin', [JsonadmController::class, ['admin', 'api']]); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | - return $this->createClient()->delete( $request, new Response() ); |
|
| 45 | + return $this->createClient()->delete($request, new Response()); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | |
@@ -52,13 +52,13 @@ discard block |
||
| 52 | 52 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
| 53 | 53 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
| 54 | 54 | */ |
| 55 | - public function getAction( ServerRequestInterface $request ) |
|
| 55 | + public function getAction(ServerRequestInterface $request) |
|
| 56 | 56 | { |
| 57 | - if( config( 'shop.authorize', true ) ) { |
|
| 58 | - $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'editor']] ); |
|
| 57 | + if (config('shop.authorize', true)) { |
|
| 58 | + $this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor']]); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | - return $this->createClient()->get( $request, new Response() ); |
|
| 61 | + return $this->createClient()->get($request, new Response()); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | |
@@ -68,13 +68,13 @@ discard block |
||
| 68 | 68 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
| 69 | 69 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
| 70 | 70 | */ |
| 71 | - public function patchAction( ServerRequestInterface $request ) |
|
| 71 | + public function patchAction(ServerRequestInterface $request) |
|
| 72 | 72 | { |
| 73 | - if( config( 'shop.authorize', true ) ) { |
|
| 74 | - $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] ); |
|
| 73 | + if (config('shop.authorize', true)) { |
|
| 74 | + $this->authorize('admin', [JsonadmController::class, ['admin', 'api']]); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - return $this->createClient()->patch( $request, new Response() ); |
|
| 77 | + return $this->createClient()->patch($request, new Response()); |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | |
@@ -84,13 +84,13 @@ discard block |
||
| 84 | 84 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
| 85 | 85 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
| 86 | 86 | */ |
| 87 | - public function postAction( ServerRequestInterface $request ) |
|
| 87 | + public function postAction(ServerRequestInterface $request) |
|
| 88 | 88 | { |
| 89 | - if( config( 'shop.authorize', true ) ) { |
|
| 90 | - $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] ); |
|
| 89 | + if (config('shop.authorize', true)) { |
|
| 90 | + $this->authorize('admin', [JsonadmController::class, ['admin', 'api']]); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | - return $this->createClient()->post( $request, new Response() ); |
|
| 93 | + return $this->createClient()->post($request, new Response()); |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | |
@@ -100,13 +100,13 @@ discard block |
||
| 100 | 100 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
| 101 | 101 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
| 102 | 102 | */ |
| 103 | - public function putAction( ServerRequestInterface $request ) |
|
| 103 | + public function putAction(ServerRequestInterface $request) |
|
| 104 | 104 | { |
| 105 | - if( config( 'shop.authorize', true ) ) { |
|
| 106 | - $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] ); |
|
| 105 | + if (config('shop.authorize', true)) { |
|
| 106 | + $this->authorize('admin', [JsonadmController::class, ['admin', 'api']]); |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | - return $this->createClient()->put( $request, new Response() ); |
|
| 109 | + return $this->createClient()->put($request, new Response()); |
|
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | |
@@ -116,13 +116,13 @@ discard block |
||
| 116 | 116 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
| 117 | 117 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
| 118 | 118 | */ |
| 119 | - public function optionsAction( ServerRequestInterface $request ) |
|
| 119 | + public function optionsAction(ServerRequestInterface $request) |
|
| 120 | 120 | { |
| 121 | - if( config( 'shop.authorize', true ) ) { |
|
| 122 | - $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'editor']] ); |
|
| 121 | + if (config('shop.authorize', true)) { |
|
| 122 | + $this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor']]); |
|
| 123 | 123 | } |
| 124 | 124 | |
| 125 | - return $this->createClient()->options( $request, new Response() ); |
|
| 125 | + return $this->createClient()->options($request, new Response()); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | |
@@ -133,18 +133,18 @@ discard block |
||
| 133 | 133 | */ |
| 134 | 134 | protected function createClient() |
| 135 | 135 | { |
| 136 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); |
|
| 137 | - $lang = Input::get( 'locale', config( 'app.locale', 'en' ) ); |
|
| 138 | - $resource = Route::input( 'resource' ); |
|
| 136 | + $site = Route::input('site', Input::get('site', 'default')); |
|
| 137 | + $lang = Input::get('locale', config('app.locale', 'en')); |
|
| 138 | + $resource = Route::input('resource'); |
|
| 139 | 139 | |
| 140 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
| 141 | - $templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' ); |
|
| 140 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
| 141 | + $templatePaths = $aimeos->getCustomPaths('admin/jsonadm/templates'); |
|
| 142 | 142 | |
| 143 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' ); |
|
| 144 | - $context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang, 'en' ) ) ); |
|
| 145 | - $context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) ); |
|
| 146 | - $context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $templatePaths, $lang ) ); |
|
| 143 | + $context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend'); |
|
| 144 | + $context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en'))); |
|
| 145 | + $context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site)); |
|
| 146 | + $context->setView(app('\Aimeos\Shop\Base\View')->create($context, $templatePaths, $lang)); |
|
| 147 | 147 | |
| 148 | - return \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, $resource ); |
|
| 148 | + return \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, $resource); |
|
| 149 | 149 | } |
| 150 | 150 | } |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object |
| 41 | 41 | * @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object |
| 42 | 42 | */ |
| 43 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos ) |
|
| 43 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos) |
|
| 44 | 44 | { |
| 45 | 45 | $this->aimeos = $aimeos; |
| 46 | 46 | $this->config = $config; |
@@ -53,23 +53,23 @@ discard block |
||
| 53 | 53 | * @param integer $type Configuration type ("frontend" or "backend") |
| 54 | 54 | * @return \Aimeos\MW\Config\Iface Configuration object |
| 55 | 55 | */ |
| 56 | - public function get( $type = 'frontend' ) |
|
| 56 | + public function get($type = 'frontend') |
|
| 57 | 57 | { |
| 58 | - if( !isset( $this->objects[$type] ) ) |
|
| 58 | + if (!isset($this->objects[$type])) |
|
| 59 | 59 | { |
| 60 | 60 | $configPaths = $this->aimeos->get()->getConfigPaths(); |
| 61 | - $cfgfile = dirname( dirname( dirname( __DIR__ ) ) ) . DIRECTORY_SEPARATOR . 'default.php'; |
|
| 61 | + $cfgfile = dirname(dirname(dirname(__DIR__))).DIRECTORY_SEPARATOR.'default.php'; |
|
| 62 | 62 | |
| 63 | - $config = new \Aimeos\MW\Config\PHPArray( require $cfgfile, $configPaths ); |
|
| 63 | + $config = new \Aimeos\MW\Config\PHPArray(require $cfgfile, $configPaths); |
|
| 64 | 64 | |
| 65 | - if( $this->config->get( 'shop.apc_enabled', false ) == true ) { |
|
| 66 | - $config = new \Aimeos\MW\Config\Decorator\APC( $config, $this->config->get( 'shop.apc_prefix', 'laravel:' ) ); |
|
| 65 | + if ($this->config->get('shop.apc_enabled', false) == true) { |
|
| 66 | + $config = new \Aimeos\MW\Config\Decorator\APC($config, $this->config->get('shop.apc_prefix', 'laravel:')); |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - $config = new \Aimeos\MW\Config\Decorator\Memory( $config, $this->config->get( 'shop' ) ); |
|
| 69 | + $config = new \Aimeos\MW\Config\Decorator\Memory($config, $this->config->get('shop')); |
|
| 70 | 70 | |
| 71 | - if( ( $conf = $this->config->get( 'shop.' . $type, array() ) ) !== array() ) { |
|
| 72 | - $config = new \Aimeos\MW\Config\Decorator\Memory( $config, $conf ); |
|
| 71 | + if (($conf = $this->config->get('shop.'.$type, array())) !== array()) { |
|
| 72 | + $config = new \Aimeos\MW\Config\Decorator\Memory($config, $conf); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | $this->objects[$type] = $config; |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object |
| 41 | 41 | * @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object |
| 42 | 42 | */ |
| 43 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos ) |
|
| 43 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos) |
|
| 44 | 44 | { |
| 45 | 45 | $this->aimeos = $aimeos; |
| 46 | 46 | $this->config = $config; |
@@ -53,22 +53,22 @@ discard block |
||
| 53 | 53 | * @param array $languageIds List of two letter ISO language IDs |
| 54 | 54 | * @return \Aimeos\MW\Translation\Iface[] List of translation objects |
| 55 | 55 | */ |
| 56 | - public function get( array $languageIds ) |
|
| 56 | + public function get(array $languageIds) |
|
| 57 | 57 | { |
| 58 | 58 | $i18nPaths = $this->aimeos->get()->getI18nPaths(); |
| 59 | 59 | |
| 60 | - foreach( $languageIds as $langid ) |
|
| 60 | + foreach ($languageIds as $langid) |
|
| 61 | 61 | { |
| 62 | - if( !isset( $this->i18n[$langid] ) ) |
|
| 62 | + if (!isset($this->i18n[$langid])) |
|
| 63 | 63 | { |
| 64 | - $i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $langid ); |
|
| 64 | + $i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $langid); |
|
| 65 | 65 | |
| 66 | - if( $this->config->get( 'shop.apc_enabled', false ) == true ) { |
|
| 67 | - $i18n = new \Aimeos\MW\Translation\Decorator\APC( $i18n, $this->config->get( 'shop.apc_prefix', 'laravel:' ) ); |
|
| 66 | + if ($this->config->get('shop.apc_enabled', false) == true) { |
|
| 67 | + $i18n = new \Aimeos\MW\Translation\Decorator\APC($i18n, $this->config->get('shop.apc_prefix', 'laravel:')); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | - if( $this->config->has( 'shop.i18n.' . $langid ) ) { |
|
| 71 | - $i18n = new \Aimeos\MW\Translation\Decorator\Memory( $i18n, $this->config->get( 'shop.i18n.' . $langid ) ); |
|
| 70 | + if ($this->config->has('shop.i18n.'.$langid)) { |
|
| 71 | + $i18n = new \Aimeos\MW\Translation\Decorator\Memory($i18n, $this->config->get('shop.i18n.'.$langid)); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | $this->i18n[$langid] = $i18n; |
@@ -31,9 +31,9 @@ discard block |
||
| 31 | 31 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
| 32 | 32 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
| 33 | 33 | */ |
| 34 | - public function deleteAction( ServerRequestInterface $request ) |
|
| 34 | + public function deleteAction(ServerRequestInterface $request) |
|
| 35 | 35 | { |
| 36 | - return $this->createClient()->delete( $request, new Response() ); |
|
| 36 | + return $this->createClient()->delete($request, new Response()); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | |
@@ -43,9 +43,9 @@ discard block |
||
| 43 | 43 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
| 44 | 44 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
| 45 | 45 | */ |
| 46 | - public function getAction( ServerRequestInterface $request ) |
|
| 46 | + public function getAction(ServerRequestInterface $request) |
|
| 47 | 47 | { |
| 48 | - return $this->createClient()->get( $request, new Response() ); |
|
| 48 | + return $this->createClient()->get($request, new Response()); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | |
@@ -55,9 +55,9 @@ discard block |
||
| 55 | 55 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
| 56 | 56 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
| 57 | 57 | */ |
| 58 | - public function patchAction( ServerRequestInterface $request ) |
|
| 58 | + public function patchAction(ServerRequestInterface $request) |
|
| 59 | 59 | { |
| 60 | - return $this->createClient()->patch( $request, new Response() ); |
|
| 60 | + return $this->createClient()->patch($request, new Response()); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | |
@@ -67,9 +67,9 @@ discard block |
||
| 67 | 67 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
| 68 | 68 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
| 69 | 69 | */ |
| 70 | - public function postAction( ServerRequestInterface $request ) |
|
| 70 | + public function postAction(ServerRequestInterface $request) |
|
| 71 | 71 | { |
| 72 | - return $this->createClient()->post( $request, new Response() ); |
|
| 72 | + return $this->createClient()->post($request, new Response()); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | |
@@ -79,9 +79,9 @@ discard block |
||
| 79 | 79 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
| 80 | 80 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
| 81 | 81 | */ |
| 82 | - public function putAction( ServerRequestInterface $request ) |
|
| 82 | + public function putAction(ServerRequestInterface $request) |
|
| 83 | 83 | { |
| 84 | - return $this->createClient()->put( $request, new Response() ); |
|
| 84 | + return $this->createClient()->put($request, new Response()); |
|
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | |
@@ -91,9 +91,9 @@ discard block |
||
| 91 | 91 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
| 92 | 92 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
| 93 | 93 | */ |
| 94 | - public function optionsAction( ServerRequestInterface $request ) |
|
| 94 | + public function optionsAction(ServerRequestInterface $request) |
|
| 95 | 95 | { |
| 96 | - return $this->createClient()->options( $request, new Response() ); |
|
| 96 | + return $this->createClient()->options($request, new Response()); |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | |
@@ -104,17 +104,17 @@ discard block |
||
| 104 | 104 | */ |
| 105 | 105 | protected function createClient() |
| 106 | 106 | { |
| 107 | - $resource = Route::input( 'resource' ); |
|
| 108 | - $related = Route::input( 'related', Input::get( 'related' ) ); |
|
| 107 | + $resource = Route::input('resource'); |
|
| 108 | + $related = Route::input('related', Input::get('related')); |
|
| 109 | 109 | |
| 110 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
| 111 | - $tmplPaths = $aimeos->getCustomPaths( 'client/jsonapi/templates' ); |
|
| 110 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
| 111 | + $tmplPaths = $aimeos->getCustomPaths('client/jsonapi/templates'); |
|
| 112 | 112 | |
| 113 | - $context = app( '\Aimeos\Shop\Base\Context' )->get(); |
|
| 113 | + $context = app('\Aimeos\Shop\Base\Context')->get(); |
|
| 114 | 114 | $langid = $context->getLocale()->getLanguageId(); |
| 115 | 115 | |
| 116 | - $context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $tmplPaths, $langid ) ); |
|
| 116 | + $context->setView(app('\Aimeos\Shop\Base\View')->create($context, $tmplPaths, $langid)); |
|
| 117 | 117 | |
| 118 | - return \Aimeos\Client\JsonApi\Factory::createClient( $context, $tmplPaths, $resource . '/' . $related ); |
|
| 118 | + return \Aimeos\Client\JsonApi\Factory::createClient($context, $tmplPaths, $resource.'/'.$related); |
|
| 119 | 119 | } |
| 120 | 120 | } |