@@ -186,8 +186,7 @@ |
||
| 186 | 186 | try |
| 187 | 187 | { |
| 188 | 188 | $item = $manager->findItem( $code ); |
| 189 | - } |
|
| 190 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 189 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 191 | 190 | { |
| 192 | 191 | $item = $manager->createItem(); |
| 193 | 192 | $item->setLabel( $code ); |
@@ -29,14 +29,14 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | protected function configure() |
| 31 | 31 | { |
| 32 | - $this->setName( 'aimeos:account'); |
|
| 33 | - $this->setDescription( 'Creates new (admin) accounts' ); |
|
| 34 | - $this->addArgument( 'email', InputArgument::REQUIRED, 'E-mail address of the account that should be created' ); |
|
| 35 | - $this->addArgument( 'site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default"', 'default' ); |
|
| 36 | - $this->addOption( 'password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)' ); |
|
| 37 | - $this->addOption( 'super', null, InputOption::VALUE_NONE, 'If account should have super user privileges' ); |
|
| 38 | - $this->addOption( 'admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges' ); |
|
| 39 | - $this->addOption( 'editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges' ); |
|
| 32 | + $this->setName('aimeos:account'); |
|
| 33 | + $this->setDescription('Creates new (admin) accounts'); |
|
| 34 | + $this->addArgument('email', InputArgument::REQUIRED, 'E-mail address of the account that should be created'); |
|
| 35 | + $this->addArgument('site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default"', 'default'); |
|
| 36 | + $this->addOption('password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)'); |
|
| 37 | + $this->addOption('super', null, InputOption::VALUE_NONE, 'If account should have super user privileges'); |
|
| 38 | + $this->addOption('admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges'); |
|
| 39 | + $this->addOption('editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges'); |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | |
@@ -46,37 +46,37 @@ discard block |
||
| 46 | 46 | * @param InputInterface $input Input object |
| 47 | 47 | * @param OutputInterface $output Output object |
| 48 | 48 | */ |
| 49 | - protected function execute( InputInterface $input, OutputInterface $output ) |
|
| 49 | + protected function execute(InputInterface $input, OutputInterface $output) |
|
| 50 | 50 | { |
| 51 | - $code = $input->getArgument( 'email' ); |
|
| 52 | - if( ( $password = $input->getOption( 'password' ) ) === null ) |
|
| 51 | + $code = $input->getArgument('email'); |
|
| 52 | + if (($password = $input->getOption('password')) === null) |
|
| 53 | 53 | { |
| 54 | - $helper = $this->getHelper( 'question' ); |
|
| 55 | - $question = new Question( 'Password' ); |
|
| 56 | - $question->setHidden( true ); |
|
| 54 | + $helper = $this->getHelper('question'); |
|
| 55 | + $question = new Question('Password'); |
|
| 56 | + $question->setHidden(true); |
|
| 57 | 57 | |
| 58 | - $password = $helper->ask( $input, $output, $question ); |
|
| 58 | + $password = $helper->ask($input, $output, $question); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | - $context = $this->getContainer()->get( 'aimeos_context' )->get( false, 'command' ); |
|
| 62 | - $context->setEditor( 'aimeos:account' ); |
|
| 61 | + $context = $this->getContainer()->get('aimeos_context')->get(false, 'command'); |
|
| 62 | + $context->setEditor('aimeos:account'); |
|
| 63 | 63 | |
| 64 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
| 65 | - $localeItem = $localeManager->bootstrap( $input->getArgument( 'site' ), '', '', false ); |
|
| 66 | - $context->setLocale( $localeItem ); |
|
| 64 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
| 65 | + $localeItem = $localeManager->bootstrap($input->getArgument('site'), '', '', false); |
|
| 66 | + $context->setLocale($localeItem); |
|
| 67 | 67 | |
| 68 | - $user = $this->createCustomerItem( $context, $code, $password ); |
|
| 68 | + $user = $this->createCustomerItem($context, $code, $password); |
|
| 69 | 69 | |
| 70 | - if( $input->getOption( 'super' ) ) { |
|
| 71 | - $this->addGroup( $input, $output, $context, $user, 'super' ); |
|
| 70 | + if ($input->getOption('super')) { |
|
| 71 | + $this->addGroup($input, $output, $context, $user, 'super'); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | - if( $input->getOption( 'admin' ) ) { |
|
| 75 | - $this->addGroup( $input, $output, $context, $user, 'admin' ); |
|
| 74 | + if ($input->getOption('admin')) { |
|
| 75 | + $this->addGroup($input, $output, $context, $user, 'admin'); |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | - if( $input->getOption( 'editor' ) ) { |
|
| 79 | - $this->addGroup( $input, $output, $context, $user, 'editor' ); |
|
| 78 | + if ($input->getOption('editor')) { |
|
| 79 | + $this->addGroup($input, $output, $context, $user, 'editor'); |
|
| 80 | 80 | } |
| 81 | 81 | } |
| 82 | 82 | |
@@ -90,24 +90,24 @@ discard block |
||
| 90 | 90 | * @param \Aimeos\MShop\Customer\Item\Iface $user Aimeos customer object |
| 91 | 91 | * @param string $group Unique customer group code |
| 92 | 92 | */ |
| 93 | - protected function addGroup( InputInterface $input, OutputInterface $output, |
|
| 94 | - \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group ) |
|
| 93 | + protected function addGroup(InputInterface $input, OutputInterface $output, |
|
| 94 | + \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group) |
|
| 95 | 95 | { |
| 96 | - $output->writeln( sprintf( 'Add "%1$s" group to user "%2$s" for sites', $group, $user->getCode() ) ); |
|
| 96 | + $output->writeln(sprintf('Add "%1$s" group to user "%2$s" for sites', $group, $user->getCode())); |
|
| 97 | 97 | |
| 98 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
| 98 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
| 99 | 99 | |
| 100 | - foreach( $this->getSiteItems( $context, $input ) as $siteItem ) |
|
| 100 | + foreach ($this->getSiteItems($context, $input) as $siteItem) |
|
| 101 | 101 | { |
| 102 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
| 102 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
| 103 | 103 | |
| 104 | 104 | $lcontext = clone $context; |
| 105 | - $lcontext->setLocale( $localeItem ); |
|
| 105 | + $lcontext->setLocale($localeItem); |
|
| 106 | 106 | |
| 107 | - $output->writeln( '- ' . $siteItem->getCode() ); |
|
| 107 | + $output->writeln('- '.$siteItem->getCode()); |
|
| 108 | 108 | |
| 109 | - $groupItem = $this->getGroupItem( $lcontext, $group ); |
|
| 110 | - $this->addListItem( $lcontext, $user->getId(), $groupItem->getId() ); |
|
| 109 | + $groupItem = $this->getGroupItem($lcontext, $group); |
|
| 110 | + $this->addListItem($lcontext, $user->getId(), $groupItem->getId()); |
|
| 111 | 111 | } |
| 112 | 112 | } |
| 113 | 113 | |
@@ -119,31 +119,31 @@ discard block |
||
| 119 | 119 | * @param string $userid Unique user ID |
| 120 | 120 | * @param string $groupid Unique group ID |
| 121 | 121 | */ |
| 122 | - protected function addListItem( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid ) |
|
| 122 | + protected function addListItem(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid) |
|
| 123 | 123 | { |
| 124 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'lists' ); |
|
| 125 | - $typeid = $manager->getSubmanager( 'type' )->findItem( 'default', array(), 'customer/group' )->getId(); |
|
| 124 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('lists'); |
|
| 125 | + $typeid = $manager->getSubmanager('type')->findItem('default', array(), 'customer/group')->getId(); |
|
| 126 | 126 | |
| 127 | 127 | $search = $manager->createSearch(); |
| 128 | 128 | $expr = array( |
| 129 | - $search->compare( '==', 'customer.lists.parentid', $userid ), |
|
| 130 | - $search->compare( '==', 'customer.lists.refid', $groupid ), |
|
| 131 | - $search->compare( '==', 'customer.lists.domain', 'customer/group' ), |
|
| 132 | - $search->compare( '==', 'customer.lists.typeid', $typeid ), |
|
| 129 | + $search->compare('==', 'customer.lists.parentid', $userid), |
|
| 130 | + $search->compare('==', 'customer.lists.refid', $groupid), |
|
| 131 | + $search->compare('==', 'customer.lists.domain', 'customer/group'), |
|
| 132 | + $search->compare('==', 'customer.lists.typeid', $typeid), |
|
| 133 | 133 | ); |
| 134 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 135 | - $search->setSlice( 0, 1 ); |
|
| 134 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 135 | + $search->setSlice(0, 1); |
|
| 136 | 136 | |
| 137 | - if( count( $manager->searchItems( $search ) ) === 0 ) |
|
| 137 | + if (count($manager->searchItems($search)) === 0) |
|
| 138 | 138 | { |
| 139 | 139 | $item = $manager->createItem(); |
| 140 | - $item->setDomain( 'customer/group' ); |
|
| 141 | - $item->setParentId( $userid ); |
|
| 142 | - $item->setTypeId( $typeid ); |
|
| 143 | - $item->setRefId( $groupid ); |
|
| 144 | - $item->setStatus( 1 ); |
|
| 140 | + $item->setDomain('customer/group'); |
|
| 141 | + $item->setParentId($userid); |
|
| 142 | + $item->setTypeId($typeid); |
|
| 143 | + $item->setRefId($groupid); |
|
| 144 | + $item->setStatus(1); |
|
| 145 | 145 | |
| 146 | - $manager->saveItem( $item, false ); |
|
| 146 | + $manager->saveItem($item, false); |
|
| 147 | 147 | } |
| 148 | 148 | } |
| 149 | 149 | |
@@ -158,23 +158,23 @@ discard block |
||
| 158 | 158 | * @param string $password New user password |
| 159 | 159 | * @return \Aimeos\MShop\Customer\Item\Iface Aimeos customer item object |
| 160 | 160 | */ |
| 161 | - protected function createCustomerItem( \Aimeos\MShop\Context\Item\Iface $context, $email, $password ) |
|
| 161 | + protected function createCustomerItem(\Aimeos\MShop\Context\Item\Iface $context, $email, $password) |
|
| 162 | 162 | { |
| 163 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' ); |
|
| 163 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer'); |
|
| 164 | 164 | |
| 165 | 165 | try { |
| 166 | - $item = $manager->findItem( $email ); |
|
| 167 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
| 166 | + $item = $manager->findItem($email); |
|
| 167 | + } catch (\Aimeos\MShop\Exception $e) { |
|
| 168 | 168 | $item = $manager->createItem(); |
| 169 | 169 | } |
| 170 | 170 | |
| 171 | - $item->setCode( $email ); |
|
| 172 | - $item->setLabel( $email ); |
|
| 173 | - $item->getPaymentAddress()->setEmail( $email ); |
|
| 174 | - $item->setPassword( $password ); |
|
| 175 | - $item->setStatus( 1 ); |
|
| 171 | + $item->setCode($email); |
|
| 172 | + $item->setLabel($email); |
|
| 173 | + $item->getPaymentAddress()->setEmail($email); |
|
| 174 | + $item->setPassword($password); |
|
| 175 | + $item->setStatus(1); |
|
| 176 | 176 | |
| 177 | - $manager->saveItem( $item ); |
|
| 177 | + $manager->saveItem($item); |
|
| 178 | 178 | |
| 179 | 179 | return $item; |
| 180 | 180 | } |
@@ -187,21 +187,21 @@ discard block |
||
| 187 | 187 | * @param string $code Unique customer group code |
| 188 | 188 | * @return \Aimeos\MShop\Customer\Item\Group\Iface Aimeos customer group item object |
| 189 | 189 | */ |
| 190 | - protected function getGroupItem( \Aimeos\MShop\Context\Item\Iface $context, $code ) |
|
| 190 | + protected function getGroupItem(\Aimeos\MShop\Context\Item\Iface $context, $code) |
|
| 191 | 191 | { |
| 192 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'group' ); |
|
| 192 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('group'); |
|
| 193 | 193 | |
| 194 | 194 | try |
| 195 | 195 | { |
| 196 | - $item = $manager->findItem( $code ); |
|
| 196 | + $item = $manager->findItem($code); |
|
| 197 | 197 | } |
| 198 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 198 | + catch (\Aimeos\MShop\Exception $e) |
|
| 199 | 199 | { |
| 200 | 200 | $item = $manager->createItem(); |
| 201 | - $item->setLabel( $code ); |
|
| 202 | - $item->setCode( $code ); |
|
| 201 | + $item->setLabel($code); |
|
| 202 | + $item->setCode($code); |
|
| 203 | 203 | |
| 204 | - $manager->saveItem( $item ); |
|
| 204 | + $manager->saveItem($item); |
|
| 205 | 205 | } |
| 206 | 206 | |
| 207 | 207 | return $item; |
@@ -28,6 +28,6 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | public function selectComponentAction() |
| 30 | 30 | { |
| 31 | - return $this->getOutput( 'locale/select' ); |
|
| 31 | + return $this->getOutput('locale/select'); |
|
| 32 | 32 | } |
| 33 | 33 | } |
@@ -27,15 +27,15 @@ |
||
| 27 | 27 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 28 | 28 | * @return array List of group codes the user is in |
| 29 | 29 | */ |
| 30 | - public function getGroups( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 30 | + public function getGroups(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 31 | 31 | { |
| 32 | 32 | $list = array(); |
| 33 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' ); |
|
| 33 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group'); |
|
| 34 | 34 | |
| 35 | 35 | $search = $manager->createSearch(); |
| 36 | - $search->setConditions( $search->compare( '==', 'customer.group.id', $context->getGroupIds() ) ); |
|
| 36 | + $search->setConditions($search->compare('==', 'customer.group.id', $context->getGroupIds())); |
|
| 37 | 37 | |
| 38 | - foreach( $manager->searchItems( $search ) as $item ) { |
|
| 38 | + foreach ($manager->searchItems($search) as $item) { |
|
| 39 | 39 | $list[] = $item->getCode(); |
| 40 | 40 | } |
| 41 | 41 | |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | * @param RequestStack $requestStack Current request stack |
| 33 | 33 | * @param Container $container Container object to access parameters |
| 34 | 34 | */ |
| 35 | - public function __construct( RequestStack $requestStack, Container $container ) |
|
| 35 | + public function __construct(RequestStack $requestStack, Container $container) |
|
| 36 | 36 | { |
| 37 | 37 | $this->requestStack = $requestStack; |
| 38 | 38 | $this->container = $container; |
@@ -45,19 +45,19 @@ discard block |
||
| 45 | 45 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 46 | 46 | * @return \Aimeos\MShop\Locale\Item\Iface Locale item object |
| 47 | 47 | */ |
| 48 | - public function get( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 48 | + public function get(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 49 | 49 | { |
| 50 | - if( $this->locale === null ) |
|
| 50 | + if ($this->locale === null) |
|
| 51 | 51 | { |
| 52 | - $status = $this->container->getParameter( 'aimeos_shop.disable_sites' ); |
|
| 52 | + $status = $this->container->getParameter('aimeos_shop.disable_sites'); |
|
| 53 | 53 | $request = $this->requestStack->getMasterRequest(); |
| 54 | 54 | |
| 55 | - $site = $request->attributes->get( 'site', $request->query->get( 'site', 'default' ) ); |
|
| 56 | - $currency = $request->attributes->get( 'currency', $request->query->get( 'currency', '' ) ); |
|
| 57 | - $lang = $request->attributes->get( 'locale', $request->query->get( 'locale', '' ) ); |
|
| 55 | + $site = $request->attributes->get('site', $request->query->get('site', 'default')); |
|
| 56 | + $currency = $request->attributes->get('currency', $request->query->get('currency', '')); |
|
| 57 | + $lang = $request->attributes->get('locale', $request->query->get('locale', '')); |
|
| 58 | 58 | |
| 59 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
| 60 | - $this->locale = $localeManager->bootstrap( $site, $lang, $currency, $status ); |
|
| 59 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
| 60 | + $this->locale = $localeManager->bootstrap($site, $lang, $currency, $status); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | return $this->locale; |
@@ -71,17 +71,17 @@ discard block |
||
| 71 | 71 | * @param string $site Unique site code |
| 72 | 72 | * @return \Aimeos\MShop\Locale\Item\Iface Locale item object |
| 73 | 73 | */ |
| 74 | - public function getBackend( \Aimeos\MShop\Context\Item\Iface $context, $site ) |
|
| 74 | + public function getBackend(\Aimeos\MShop\Context\Item\Iface $context, $site) |
|
| 75 | 75 | { |
| 76 | - $localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' ); |
|
| 76 | + $localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale'); |
|
| 77 | 77 | |
| 78 | 78 | try |
| 79 | 79 | { |
| 80 | - $localeItem = $localeManager->bootstrap( $site, '', '', false ); |
|
| 81 | - $localeItem->setLanguageId( null ); |
|
| 82 | - $localeItem->setCurrencyId( null ); |
|
| 80 | + $localeItem = $localeManager->bootstrap($site, '', '', false); |
|
| 81 | + $localeItem->setLanguageId(null); |
|
| 82 | + $localeItem->setCurrencyId(null); |
|
| 83 | 83 | } |
| 84 | - catch( \Aimeos\MShop\Locale\Exception $e ) |
|
| 84 | + catch (\Aimeos\MShop\Locale\Exception $e) |
|
| 85 | 85 | { |
| 86 | 86 | $localeItem = $localeManager->createItem(); |
| 87 | 87 | } |
@@ -80,8 +80,7 @@ |
||
| 80 | 80 | $localeItem = $localeManager->bootstrap( $site, '', '', false ); |
| 81 | 81 | $localeItem->setLanguageId( null ); |
| 82 | 82 | $localeItem->setCurrencyId( null ); |
| 83 | - } |
|
| 84 | - catch( \Aimeos\MShop\Locale\Exception $e ) |
|
| 83 | + } catch( \Aimeos\MShop\Locale\Exception $e ) |
|
| 85 | 84 | { |
| 86 | 85 | $localeItem = $localeManager->createItem(); |
| 87 | 86 | } |
@@ -29,26 +29,26 @@ |
||
| 29 | 29 | public function getConfigTreeBuilder() |
| 30 | 30 | { |
| 31 | 31 | $treeBuilder = new TreeBuilder(); |
| 32 | - $rootNode = $treeBuilder->root( 'aimeos_shop' ); |
|
| 32 | + $rootNode = $treeBuilder->root('aimeos_shop'); |
|
| 33 | 33 | |
| 34 | 34 | $rootNode |
| 35 | 35 | ->children() |
| 36 | - ->booleanNode('disable_sites')->defaultValue( true )->end() |
|
| 37 | - ->booleanNode('apc_enable')->defaultValue( false )->end() |
|
| 38 | - ->scalarNode('apc_prefix')->defaultValue( 'sf2:' )->end() |
|
| 36 | + ->booleanNode('disable_sites')->defaultValue(true)->end() |
|
| 37 | + ->booleanNode('apc_enable')->defaultValue(false)->end() |
|
| 38 | + ->scalarNode('apc_prefix')->defaultValue('sf2:')->end() |
|
| 39 | 39 | ->scalarNode('extdir')->end() |
| 40 | 40 | ->scalarNode('uploaddir')->end() |
| 41 | - ->variableNode('admin')->defaultValue( array() )->end() |
|
| 42 | - ->variableNode('client')->defaultValue( array() )->end() |
|
| 43 | - ->variableNode('controller')->defaultValue( array() )->end() |
|
| 44 | - ->variableNode('i18n')->defaultValue( array() )->end() |
|
| 45 | - ->variableNode('madmin')->defaultValue( array() )->end() |
|
| 46 | - ->variableNode('mshop')->defaultValue( array() )->end() |
|
| 47 | - ->variableNode('resource')->defaultValue( array() )->end() |
|
| 48 | - ->variableNode('page')->defaultValue( array() )->end() |
|
| 49 | - ->variableNode('backend')->defaultValue( array() )->end() |
|
| 50 | - ->variableNode('frontend')->defaultValue( array() )->end() |
|
| 51 | - ->variableNode('command')->defaultValue( array() )->end() |
|
| 41 | + ->variableNode('admin')->defaultValue(array())->end() |
|
| 42 | + ->variableNode('client')->defaultValue(array())->end() |
|
| 43 | + ->variableNode('controller')->defaultValue(array())->end() |
|
| 44 | + ->variableNode('i18n')->defaultValue(array())->end() |
|
| 45 | + ->variableNode('madmin')->defaultValue(array())->end() |
|
| 46 | + ->variableNode('mshop')->defaultValue(array())->end() |
|
| 47 | + ->variableNode('resource')->defaultValue(array())->end() |
|
| 48 | + ->variableNode('page')->defaultValue(array())->end() |
|
| 49 | + ->variableNode('backend')->defaultValue(array())->end() |
|
| 50 | + ->variableNode('frontend')->defaultValue(array())->end() |
|
| 51 | + ->variableNode('command')->defaultValue(array())->end() |
|
| 52 | 52 | ->end() |
| 53 | 53 | ; |
| 54 | 54 | |
@@ -29,13 +29,13 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | protected function configure() |
| 31 | 31 | { |
| 32 | - $this->setName( 'aimeos:setup'); |
|
| 33 | - $this->setDescription( 'Initialize or update the Aimeos database tables' ); |
|
| 34 | - $this->addArgument( 'site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default' ); |
|
| 35 | - $this->addArgument( 'tplsite', InputArgument::OPTIONAL, 'Template site for creating or updating database entries', 'default' ); |
|
| 36 | - $this->addOption( 'option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array() ); |
|
| 37 | - $this->addOption( 'action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate' ); |
|
| 38 | - $this->addOption( 'task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null ); |
|
| 32 | + $this->setName('aimeos:setup'); |
|
| 33 | + $this->setDescription('Initialize or update the Aimeos database tables'); |
|
| 34 | + $this->addArgument('site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default'); |
|
| 35 | + $this->addArgument('tplsite', InputArgument::OPTIONAL, 'Template site for creating or updating database entries', 'default'); |
|
| 36 | + $this->addOption('option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array()); |
|
| 37 | + $this->addOption('action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate'); |
|
| 38 | + $this->addOption('task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | |
@@ -45,41 +45,41 @@ discard block |
||
| 45 | 45 | * @param InputInterface $input Input object |
| 46 | 46 | * @param OutputInterface $output Output object |
| 47 | 47 | */ |
| 48 | - protected function execute( InputInterface $input, OutputInterface $output ) |
|
| 48 | + protected function execute(InputInterface $input, OutputInterface $output) |
|
| 49 | 49 | { |
| 50 | - $ctx = $this->getContainer()->get( 'aimeos_context' )->get( false, 'command' ); |
|
| 51 | - $ctx->setEditor( 'aimeos:setup' ); |
|
| 50 | + $ctx = $this->getContainer()->get('aimeos_context')->get(false, 'command'); |
|
| 51 | + $ctx->setEditor('aimeos:setup'); |
|
| 52 | 52 | |
| 53 | 53 | $config = $ctx->getConfig(); |
| 54 | - $site = $input->getArgument( 'site' ); |
|
| 55 | - $tplsite = $input->getArgument( 'tplsite' ); |
|
| 54 | + $site = $input->getArgument('site'); |
|
| 55 | + $tplsite = $input->getArgument('tplsite'); |
|
| 56 | 56 | |
| 57 | - $config->set( 'setup/site', $site ); |
|
| 58 | - $dbconfig = $this->getDbConfig( $config ); |
|
| 59 | - $this->setOptions( $config, $input ); |
|
| 57 | + $config->set('setup/site', $site); |
|
| 58 | + $dbconfig = $this->getDbConfig($config); |
|
| 59 | + $this->setOptions($config, $input); |
|
| 60 | 60 | |
| 61 | - $taskPaths = $this->getContainer()->get( 'aimeos' )->get()->getSetupPaths( $tplsite ); |
|
| 62 | - $manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx ); |
|
| 61 | + $taskPaths = $this->getContainer()->get('aimeos')->get()->getSetupPaths($tplsite); |
|
| 62 | + $manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx); |
|
| 63 | 63 | |
| 64 | - $output->writeln( sprintf( 'Initializing or updating the Aimeos database tables for site <info>%1$s</info>', $site ) ); |
|
| 64 | + $output->writeln(sprintf('Initializing or updating the Aimeos database tables for site <info>%1$s</info>', $site)); |
|
| 65 | 65 | |
| 66 | - if( ( $task = $input->getOption( 'task' ) ) && is_array( $task ) ) { |
|
| 67 | - $task = reset( $task ); |
|
| 66 | + if (($task = $input->getOption('task')) && is_array($task)) { |
|
| 67 | + $task = reset($task); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | - switch( $input->getOption( 'action' ) ) |
|
| 70 | + switch ($input->getOption('action')) |
|
| 71 | 71 | { |
| 72 | 72 | case 'migrate': |
| 73 | - $manager->migrate( $task ); |
|
| 73 | + $manager->migrate($task); |
|
| 74 | 74 | break; |
| 75 | 75 | case 'rollback': |
| 76 | - $manager->rollback( $task ); |
|
| 76 | + $manager->rollback($task); |
|
| 77 | 77 | break; |
| 78 | 78 | case 'clean': |
| 79 | - $manager->clean( $task ); |
|
| 79 | + $manager->clean($task); |
|
| 80 | 80 | break; |
| 81 | 81 | default: |
| 82 | - throw new \Exception( sprintf( 'Invalid setup action "%1$s"', $input->getOption( 'action' ) ) ); |
|
| 82 | + throw new \Exception(sprintf('Invalid setup action "%1$s"', $input->getOption('action'))); |
|
| 83 | 83 | } |
| 84 | 84 | } |
| 85 | 85 | |
@@ -90,14 +90,14 @@ discard block |
||
| 90 | 90 | * @param \Aimeos\MW\Config\Iface $conf Config object |
| 91 | 91 | * @return array Multi-dimensional associative list of database configuration parameters |
| 92 | 92 | */ |
| 93 | - protected function getDbConfig( \Aimeos\MW\Config\Iface $conf ) |
|
| 93 | + protected function getDbConfig(\Aimeos\MW\Config\Iface $conf) |
|
| 94 | 94 | { |
| 95 | - $dbconfig = $conf->get( 'resource', array() ); |
|
| 95 | + $dbconfig = $conf->get('resource', array()); |
|
| 96 | 96 | |
| 97 | - foreach( $dbconfig as $rname => $dbconf ) |
|
| 97 | + foreach ($dbconfig as $rname => $dbconf) |
|
| 98 | 98 | { |
| 99 | - if( strncmp( $rname, 'db', 2 ) !== 0 ) { |
|
| 100 | - unset( $dbconfig[$rname] ); |
|
| 99 | + if (strncmp($rname, 'db', 2) !== 0) { |
|
| 100 | + unset($dbconfig[$rname]); |
|
| 101 | 101 | } |
| 102 | 102 | } |
| 103 | 103 | |
@@ -113,12 +113,12 @@ discard block |
||
| 113 | 113 | * @param array Associative list of database configurations |
| 114 | 114 | * @throws \RuntimeException If the format of the options is invalid |
| 115 | 115 | */ |
| 116 | - protected function setOptions( \Aimeos\MW\Config\Iface $conf, InputInterface $input ) |
|
| 116 | + protected function setOptions(\Aimeos\MW\Config\Iface $conf, InputInterface $input) |
|
| 117 | 117 | { |
| 118 | - foreach( (array) $input->getOption( 'option' ) as $option ) |
|
| 118 | + foreach ((array) $input->getOption('option') as $option) |
|
| 119 | 119 | { |
| 120 | - list( $name, $value ) = explode( ':', $option ); |
|
| 121 | - $conf->set( str_replace( '\\', '/', $name ), $value ); |
|
| 120 | + list($name, $value) = explode(':', $option); |
|
| 121 | + $conf->set(str_replace('\\', '/', $name), $value); |
|
| 122 | 122 | } |
| 123 | 123 | } |
| 124 | 124 | } |
@@ -12,29 +12,29 @@ discard block |
||
| 12 | 12 | $client = static::createClient(array(), array( |
| 13 | 13 | 'PHP_AUTH_USER' => 'admin', |
| 14 | 14 | 'PHP_AUTH_PW' => 'adminpass', |
| 15 | - ) ); |
|
| 15 | + )); |
|
| 16 | 16 | |
| 17 | 17 | |
| 18 | - $client->request( 'OPTIONS', '/unittest/jsonadm/product' ); |
|
| 18 | + $client->request('OPTIONS', '/unittest/jsonadm/product'); |
|
| 19 | 19 | $response = $client->getResponse(); |
| 20 | 20 | |
| 21 | - $json = json_decode( $response->getContent(), true ); |
|
| 21 | + $json = json_decode($response->getContent(), true); |
|
| 22 | 22 | |
| 23 | - $this->assertNotNull( $json ); |
|
| 24 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 25 | - $this->assertArrayHasKey( 'resources', $json['meta'] ); |
|
| 26 | - $this->assertGreaterThan( 1, count( $json['meta']['resources'] ) ); |
|
| 23 | + $this->assertNotNull($json); |
|
| 24 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 25 | + $this->assertArrayHasKey('resources', $json['meta']); |
|
| 26 | + $this->assertGreaterThan(1, count($json['meta']['resources'])); |
|
| 27 | 27 | |
| 28 | 28 | |
| 29 | - $client->request( 'OPTIONS', '/unittest/jsonadm' ); |
|
| 29 | + $client->request('OPTIONS', '/unittest/jsonadm'); |
|
| 30 | 30 | $response = $client->getResponse(); |
| 31 | 31 | |
| 32 | - $json = json_decode( $response->getContent(), true ); |
|
| 32 | + $json = json_decode($response->getContent(), true); |
|
| 33 | 33 | |
| 34 | - $this->assertNotNull( $json ); |
|
| 35 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 36 | - $this->assertArrayHasKey( 'resources', $json['meta'] ); |
|
| 37 | - $this->assertGreaterThan( 1, count( $json['meta']['resources'] ) ); |
|
| 34 | + $this->assertNotNull($json); |
|
| 35 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 36 | + $this->assertArrayHasKey('resources', $json['meta']); |
|
| 37 | + $this->assertGreaterThan(1, count($json['meta']['resources'])); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | |
@@ -43,62 +43,62 @@ discard block |
||
| 43 | 43 | $client = static::createClient(array(), array( |
| 44 | 44 | 'PHP_AUTH_USER' => 'admin', |
| 45 | 45 | 'PHP_AUTH_PW' => 'adminpass', |
| 46 | - ) ); |
|
| 46 | + )); |
|
| 47 | 47 | |
| 48 | 48 | |
| 49 | 49 | $content = '{"data":{"type":"stock/type","attributes":{"stock.type.code":"symfony","stock.type.label":"symfony"}}}'; |
| 50 | - $client->request( 'POST', '/unittest/jsonadm/stock/type', array(), array(), array(), $content ); |
|
| 50 | + $client->request('POST', '/unittest/jsonadm/stock/type', array(), array(), array(), $content); |
|
| 51 | 51 | $response = $client->getResponse(); |
| 52 | 52 | |
| 53 | - $json = json_decode( $response->getContent(), true ); |
|
| 53 | + $json = json_decode($response->getContent(), true); |
|
| 54 | 54 | |
| 55 | - $this->assertNotNull( $json ); |
|
| 56 | - $this->assertEquals( 201, $response->getStatusCode() ); |
|
| 57 | - $this->assertArrayHasKey( 'stock.type.id', $json['data']['attributes'] ); |
|
| 58 | - $this->assertEquals( 'symfony', $json['data']['attributes']['stock.type.code'] ); |
|
| 59 | - $this->assertEquals( 'symfony', $json['data']['attributes']['stock.type.label'] ); |
|
| 60 | - $this->assertEquals( 1, $json['meta']['total'] ); |
|
| 55 | + $this->assertNotNull($json); |
|
| 56 | + $this->assertEquals(201, $response->getStatusCode()); |
|
| 57 | + $this->assertArrayHasKey('stock.type.id', $json['data']['attributes']); |
|
| 58 | + $this->assertEquals('symfony', $json['data']['attributes']['stock.type.code']); |
|
| 59 | + $this->assertEquals('symfony', $json['data']['attributes']['stock.type.label']); |
|
| 60 | + $this->assertEquals(1, $json['meta']['total']); |
|
| 61 | 61 | |
| 62 | 62 | $id = $json['data']['attributes']['stock.type.id']; |
| 63 | 63 | |
| 64 | 64 | |
| 65 | 65 | $content = '{"data":{"type":"stock/type","attributes":{"stock.type.code":"symfony2","stock.type.label":"symfony2"}}}'; |
| 66 | - $client->request( 'PATCH', '/unittest/jsonadm/stock/type/' . $id, array(), array(), array(), $content ); |
|
| 66 | + $client->request('PATCH', '/unittest/jsonadm/stock/type/'.$id, array(), array(), array(), $content); |
|
| 67 | 67 | $response = $client->getResponse(); |
| 68 | 68 | |
| 69 | - $json = json_decode( $response->getContent(), true ); |
|
| 69 | + $json = json_decode($response->getContent(), true); |
|
| 70 | 70 | |
| 71 | - $this->assertNotNull( $json ); |
|
| 72 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 73 | - $this->assertArrayHasKey( 'stock.type.id', $json['data']['attributes'] ); |
|
| 74 | - $this->assertEquals( 'symfony2', $json['data']['attributes']['stock.type.code'] ); |
|
| 75 | - $this->assertEquals( 'symfony2', $json['data']['attributes']['stock.type.label'] ); |
|
| 76 | - $this->assertEquals( $id, $json['data']['attributes']['stock.type.id'] ); |
|
| 77 | - $this->assertEquals( 1, $json['meta']['total'] ); |
|
| 71 | + $this->assertNotNull($json); |
|
| 72 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 73 | + $this->assertArrayHasKey('stock.type.id', $json['data']['attributes']); |
|
| 74 | + $this->assertEquals('symfony2', $json['data']['attributes']['stock.type.code']); |
|
| 75 | + $this->assertEquals('symfony2', $json['data']['attributes']['stock.type.label']); |
|
| 76 | + $this->assertEquals($id, $json['data']['attributes']['stock.type.id']); |
|
| 77 | + $this->assertEquals(1, $json['meta']['total']); |
|
| 78 | 78 | |
| 79 | 79 | |
| 80 | - $client->request( 'GET', '/unittest/jsonadm/stock/type/' . $id ); |
|
| 80 | + $client->request('GET', '/unittest/jsonadm/stock/type/'.$id); |
|
| 81 | 81 | $response = $client->getResponse(); |
| 82 | 82 | |
| 83 | - $json = json_decode( $response->getContent(), true ); |
|
| 83 | + $json = json_decode($response->getContent(), true); |
|
| 84 | 84 | |
| 85 | - $this->assertNotNull( $json ); |
|
| 86 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 87 | - $this->assertArrayHasKey( 'stock.type.id', $json['data']['attributes'] ); |
|
| 88 | - $this->assertEquals( 'symfony2', $json['data']['attributes']['stock.type.code'] ); |
|
| 89 | - $this->assertEquals( 'symfony2', $json['data']['attributes']['stock.type.label'] ); |
|
| 90 | - $this->assertEquals( $id, $json['data']['attributes']['stock.type.id'] ); |
|
| 91 | - $this->assertEquals( 1, $json['meta']['total'] ); |
|
| 85 | + $this->assertNotNull($json); |
|
| 86 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 87 | + $this->assertArrayHasKey('stock.type.id', $json['data']['attributes']); |
|
| 88 | + $this->assertEquals('symfony2', $json['data']['attributes']['stock.type.code']); |
|
| 89 | + $this->assertEquals('symfony2', $json['data']['attributes']['stock.type.label']); |
|
| 90 | + $this->assertEquals($id, $json['data']['attributes']['stock.type.id']); |
|
| 91 | + $this->assertEquals(1, $json['meta']['total']); |
|
| 92 | 92 | |
| 93 | 93 | |
| 94 | - $client->request( 'DELETE', '/unittest/jsonadm/stock/type/' . $id ); |
|
| 94 | + $client->request('DELETE', '/unittest/jsonadm/stock/type/'.$id); |
|
| 95 | 95 | $response = $client->getResponse(); |
| 96 | 96 | |
| 97 | - $json = json_decode( $response->getContent(), true ); |
|
| 97 | + $json = json_decode($response->getContent(), true); |
|
| 98 | 98 | |
| 99 | - $this->assertNotNull( $json ); |
|
| 100 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 101 | - $this->assertEquals( 1, $json['meta']['total'] ); |
|
| 99 | + $this->assertNotNull($json); |
|
| 100 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 101 | + $this->assertEquals(1, $json['meta']['total']); |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | |
@@ -107,85 +107,85 @@ discard block |
||
| 107 | 107 | $client = static::createClient(array(), array( |
| 108 | 108 | 'PHP_AUTH_USER' => 'admin', |
| 109 | 109 | 'PHP_AUTH_PW' => 'adminpass', |
| 110 | - ) ); |
|
| 110 | + )); |
|
| 111 | 111 | |
| 112 | 112 | |
| 113 | 113 | $content = '{"data":[ |
| 114 | 114 | {"type":"stock/type","attributes":{"stock.type.code":"symfony","stock.type.label":"symfony"}}, |
| 115 | 115 | {"type":"stock/type","attributes":{"stock.type.code":"symfony2","stock.type.label":"symfony"}} |
| 116 | 116 | ]}'; |
| 117 | - $client->request( 'POST', '/unittest/jsonadm/stock/type', array(), array(), array(), $content ); |
|
| 117 | + $client->request('POST', '/unittest/jsonadm/stock/type', array(), array(), array(), $content); |
|
| 118 | 118 | $response = $client->getResponse(); |
| 119 | 119 | |
| 120 | - $json = json_decode( $response->getContent(), true ); |
|
| 120 | + $json = json_decode($response->getContent(), true); |
|
| 121 | 121 | |
| 122 | - $this->assertNotNull( $json ); |
|
| 123 | - $this->assertEquals( 201, $response->getStatusCode() ); |
|
| 124 | - $this->assertEquals( 2, count( $json['data'] ) ); |
|
| 125 | - $this->assertArrayHasKey( 'stock.type.id', $json['data'][0]['attributes'] ); |
|
| 126 | - $this->assertArrayHasKey( 'stock.type.id', $json['data'][1]['attributes'] ); |
|
| 127 | - $this->assertEquals( 'symfony', $json['data'][0]['attributes']['stock.type.label'] ); |
|
| 128 | - $this->assertEquals( 'symfony', $json['data'][1]['attributes']['stock.type.label'] ); |
|
| 129 | - $this->assertEquals( 2, $json['meta']['total'] ); |
|
| 122 | + $this->assertNotNull($json); |
|
| 123 | + $this->assertEquals(201, $response->getStatusCode()); |
|
| 124 | + $this->assertEquals(2, count($json['data'])); |
|
| 125 | + $this->assertArrayHasKey('stock.type.id', $json['data'][0]['attributes']); |
|
| 126 | + $this->assertArrayHasKey('stock.type.id', $json['data'][1]['attributes']); |
|
| 127 | + $this->assertEquals('symfony', $json['data'][0]['attributes']['stock.type.label']); |
|
| 128 | + $this->assertEquals('symfony', $json['data'][1]['attributes']['stock.type.label']); |
|
| 129 | + $this->assertEquals(2, $json['meta']['total']); |
|
| 130 | 130 | |
| 131 | - $ids = array( $json['data'][0]['attributes']['stock.type.id'], $json['data'][1]['attributes']['stock.type.id'] ); |
|
| 131 | + $ids = array($json['data'][0]['attributes']['stock.type.id'], $json['data'][1]['attributes']['stock.type.id']); |
|
| 132 | 132 | |
| 133 | 133 | |
| 134 | 134 | $content = '{"data":[ |
| 135 | - {"type":"stock/type","id":' . $ids[0] . ',"attributes":{"stock.type.label":"symfony2"}}, |
|
| 136 | - {"type":"stock/type","id":' . $ids[1] . ',"attributes":{"stock.type.label":"symfony2"}} |
|
| 135 | + {"type":"stock/type","id":' . $ids[0].',"attributes":{"stock.type.label":"symfony2"}}, |
|
| 136 | + {"type":"stock/type","id":' . $ids[1].',"attributes":{"stock.type.label":"symfony2"}} |
|
| 137 | 137 | ]}'; |
| 138 | - $client->request( 'PATCH', '/unittest/jsonadm/stock/type', array(), array(), array(), $content ); |
|
| 138 | + $client->request('PATCH', '/unittest/jsonadm/stock/type', array(), array(), array(), $content); |
|
| 139 | 139 | $response = $client->getResponse(); |
| 140 | 140 | |
| 141 | - $json = json_decode( $response->getContent(), true ); |
|
| 142 | - |
|
| 143 | - $this->assertNotNull( $json ); |
|
| 144 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 145 | - $this->assertEquals( 2, count( $json['data'] ) ); |
|
| 146 | - $this->assertArrayHasKey( 'stock.type.id', $json['data'][0]['attributes'] ); |
|
| 147 | - $this->assertArrayHasKey( 'stock.type.id', $json['data'][1]['attributes'] ); |
|
| 148 | - $this->assertEquals( 'symfony2', $json['data'][0]['attributes']['stock.type.label'] ); |
|
| 149 | - $this->assertEquals( 'symfony2', $json['data'][1]['attributes']['stock.type.label'] ); |
|
| 150 | - $this->assertTrue( in_array( $json['data'][0]['attributes']['stock.type.id'], $ids ) ); |
|
| 151 | - $this->assertTrue( in_array( $json['data'][1]['attributes']['stock.type.id'], $ids ) ); |
|
| 152 | - $this->assertEquals( 2, $json['meta']['total'] ); |
|
| 153 | - |
|
| 154 | - |
|
| 155 | - $getParams = array( 'filter' => array( '&&' => array( |
|
| 156 | - array( '=~' => array( 'stock.type.code' => 'symfony' ) ), |
|
| 157 | - array( '==' => array( 'stock.type.label' => 'symfony2' ) ) |
|
| 158 | - ) ), |
|
| 159 | - 'sort' => 'stock.type.code', 'page' => array( 'offset' => 0, 'limit' => 3 ) |
|
| 141 | + $json = json_decode($response->getContent(), true); |
|
| 142 | + |
|
| 143 | + $this->assertNotNull($json); |
|
| 144 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 145 | + $this->assertEquals(2, count($json['data'])); |
|
| 146 | + $this->assertArrayHasKey('stock.type.id', $json['data'][0]['attributes']); |
|
| 147 | + $this->assertArrayHasKey('stock.type.id', $json['data'][1]['attributes']); |
|
| 148 | + $this->assertEquals('symfony2', $json['data'][0]['attributes']['stock.type.label']); |
|
| 149 | + $this->assertEquals('symfony2', $json['data'][1]['attributes']['stock.type.label']); |
|
| 150 | + $this->assertTrue(in_array($json['data'][0]['attributes']['stock.type.id'], $ids)); |
|
| 151 | + $this->assertTrue(in_array($json['data'][1]['attributes']['stock.type.id'], $ids)); |
|
| 152 | + $this->assertEquals(2, $json['meta']['total']); |
|
| 153 | + |
|
| 154 | + |
|
| 155 | + $getParams = array('filter' => array('&&' => array( |
|
| 156 | + array('=~' => array('stock.type.code' => 'symfony')), |
|
| 157 | + array('==' => array('stock.type.label' => 'symfony2')) |
|
| 158 | + )), |
|
| 159 | + 'sort' => 'stock.type.code', 'page' => array('offset' => 0, 'limit' => 3) |
|
| 160 | 160 | ); |
| 161 | - $client->request( 'GET', '/unittest/jsonadm/stock/type', $getParams ); |
|
| 161 | + $client->request('GET', '/unittest/jsonadm/stock/type', $getParams); |
|
| 162 | 162 | $response = $client->getResponse(); |
| 163 | 163 | |
| 164 | - $json = json_decode( $response->getContent(), true ); |
|
| 164 | + $json = json_decode($response->getContent(), true); |
|
| 165 | 165 | |
| 166 | - $this->assertNotNull( $json ); |
|
| 167 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 168 | - $this->assertEquals( 2, count( $json['data'] ) ); |
|
| 169 | - $this->assertEquals( 'symfony', $json['data'][0]['attributes']['stock.type.code'] ); |
|
| 170 | - $this->assertEquals( 'symfony2', $json['data'][1]['attributes']['stock.type.code'] ); |
|
| 171 | - $this->assertEquals( 'symfony2', $json['data'][0]['attributes']['stock.type.label'] ); |
|
| 172 | - $this->assertEquals( 'symfony2', $json['data'][1]['attributes']['stock.type.label'] ); |
|
| 173 | - $this->assertTrue( in_array( $json['data'][0]['attributes']['stock.type.id'], $ids ) ); |
|
| 174 | - $this->assertTrue( in_array( $json['data'][1]['attributes']['stock.type.id'], $ids ) ); |
|
| 175 | - $this->assertEquals( 2, $json['meta']['total'] ); |
|
| 166 | + $this->assertNotNull($json); |
|
| 167 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 168 | + $this->assertEquals(2, count($json['data'])); |
|
| 169 | + $this->assertEquals('symfony', $json['data'][0]['attributes']['stock.type.code']); |
|
| 170 | + $this->assertEquals('symfony2', $json['data'][1]['attributes']['stock.type.code']); |
|
| 171 | + $this->assertEquals('symfony2', $json['data'][0]['attributes']['stock.type.label']); |
|
| 172 | + $this->assertEquals('symfony2', $json['data'][1]['attributes']['stock.type.label']); |
|
| 173 | + $this->assertTrue(in_array($json['data'][0]['attributes']['stock.type.id'], $ids)); |
|
| 174 | + $this->assertTrue(in_array($json['data'][1]['attributes']['stock.type.id'], $ids)); |
|
| 175 | + $this->assertEquals(2, $json['meta']['total']); |
|
| 176 | 176 | |
| 177 | 177 | |
| 178 | 178 | $content = '{"data":[ |
| 179 | - {"type":"stock/type","id":' . $ids[0] . '}, |
|
| 180 | - {"type":"stock/type","id":' . $ids[1] . '} |
|
| 179 | + {"type":"stock/type","id":' . $ids[0].'}, |
|
| 180 | + {"type":"stock/type","id":' . $ids[1].'} |
|
| 181 | 181 | ]}'; |
| 182 | - $client->request( 'DELETE', '/unittest/jsonadm/stock/type', array(), array(), array(), $content ); |
|
| 182 | + $client->request('DELETE', '/unittest/jsonadm/stock/type', array(), array(), array(), $content); |
|
| 183 | 183 | $response = $client->getResponse(); |
| 184 | 184 | |
| 185 | - $json = json_decode( $response->getContent(), true ); |
|
| 185 | + $json = json_decode($response->getContent(), true); |
|
| 186 | 186 | |
| 187 | - $this->assertNotNull( $json ); |
|
| 188 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 189 | - $this->assertEquals( 2, $json['meta']['total'] ); |
|
| 187 | + $this->assertNotNull($json); |
|
| 188 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 189 | + $this->assertEquals(2, $json['meta']['total']); |
|
| 190 | 190 | } |
| 191 | 191 | } |
@@ -28,9 +28,9 @@ discard block |
||
| 28 | 28 | */ |
| 29 | 29 | protected function configure() |
| 30 | 30 | { |
| 31 | - $this->setName( 'aimeos:cache' ); |
|
| 32 | - $this->setDescription( 'Clears the content cache' ); |
|
| 33 | - $this->addArgument( 'site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)' ); |
|
| 31 | + $this->setName('aimeos:cache'); |
|
| 32 | + $this->setDescription('Clears the content cache'); |
|
| 33 | + $this->addArgument('site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)'); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | |
@@ -40,26 +40,26 @@ discard block |
||
| 40 | 40 | * @param InputInterface $input Input object |
| 41 | 41 | * @param OutputInterface $output Output object |
| 42 | 42 | */ |
| 43 | - protected function execute( InputInterface $input, OutputInterface $output ) |
|
| 43 | + protected function execute(InputInterface $input, OutputInterface $output) |
|
| 44 | 44 | { |
| 45 | - $context = $this->getContainer()->get( 'aimeos_context' )->get( false, 'command' ); |
|
| 46 | - $context->setEditor( 'aimeos:cache' ); |
|
| 45 | + $context = $this->getContainer()->get('aimeos_context')->get(false, 'command'); |
|
| 46 | + $context->setEditor('aimeos:cache'); |
|
| 47 | 47 | |
| 48 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
| 48 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
| 49 | 49 | |
| 50 | - foreach( $this->getSiteItems( $context, $input ) as $siteItem ) |
|
| 50 | + foreach ($this->getSiteItems($context, $input) as $siteItem) |
|
| 51 | 51 | { |
| 52 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
| 52 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
| 53 | 53 | |
| 54 | 54 | $lcontext = clone $context; |
| 55 | - $lcontext->setLocale( $localeItem ); |
|
| 55 | + $lcontext->setLocale($localeItem); |
|
| 56 | 56 | |
| 57 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext ); |
|
| 58 | - $lcontext->setCache( $cache ); |
|
| 57 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext); |
|
| 58 | + $lcontext->setCache($cache); |
|
| 59 | 59 | |
| 60 | - $output->writeln( sprintf( 'Clearing the Aimeos cache for site <info>%1$s</info>', $siteItem->getCode() ) ); |
|
| 60 | + $output->writeln(sprintf('Clearing the Aimeos cache for site <info>%1$s</info>', $siteItem->getCode())); |
|
| 61 | 61 | |
| 62 | - \Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->clear(); |
|
| 62 | + \Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->clear(); |
|
| 63 | 63 | } |
| 64 | 64 | } |
| 65 | 65 | } |
@@ -82,8 +82,7 @@ discard block |
||
| 82 | 82 | && in_array( 'ROLE_ADMIN', (array) $token->getUser()->getRoles() ) ) |
| 83 | 83 | { |
| 84 | 84 | $helper = new \Aimeos\MW\View\Helper\Access\All( $view ); |
| 85 | - } |
|
| 86 | - else |
|
| 85 | + } else |
|
| 87 | 86 | { |
| 88 | 87 | $fcn = function() use ( $container, $context ) { |
| 89 | 88 | return $container->get( 'aimeos_support' )->getGroups( $context ); |
@@ -221,8 +220,7 @@ discard block |
||
| 221 | 220 | { |
| 222 | 221 | $i18n = $this->container->get( 'aimeos_i18n' )->get( array( $locale ) ); |
| 223 | 222 | $translation = $i18n[$locale]; |
| 224 | - } |
|
| 225 | - else |
|
| 223 | + } else |
|
| 226 | 224 | { |
| 227 | 225 | $translation = new \Aimeos\MW\Translation\None( 'en' ); |
| 228 | 226 | } |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | * @param RequestStack $requestStack Current request stack |
| 33 | 33 | * @param Container $container Container object to access parameters |
| 34 | 34 | */ |
| 35 | - public function __construct( RequestStack $requestStack, Container $container ) |
|
| 35 | + public function __construct(RequestStack $requestStack, Container $container) |
|
| 36 | 36 | { |
| 37 | 37 | $this->requestStack = $requestStack; |
| 38 | 38 | $this->container = $container; |
@@ -47,27 +47,27 @@ discard block |
||
| 47 | 47 | * @param string|null $locale Code of the current language or null for no translation |
| 48 | 48 | * @return \Aimeos\MW\View\Iface View object |
| 49 | 49 | */ |
| 50 | - public function create( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null ) |
|
| 50 | + public function create(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null) |
|
| 51 | 51 | { |
| 52 | - $twig = $this->container->get( 'twig' ); |
|
| 53 | - $engine = new \Aimeos\MW\View\Engine\Twig( $twig ); |
|
| 54 | - $view = new \Aimeos\MW\View\Standard( $templatePaths, array( '.html.twig' => $engine ) ); |
|
| 52 | + $twig = $this->container->get('twig'); |
|
| 53 | + $engine = new \Aimeos\MW\View\Engine\Twig($twig); |
|
| 54 | + $view = new \Aimeos\MW\View\Standard($templatePaths, array('.html.twig' => $engine)); |
|
| 55 | 55 | |
| 56 | 56 | $config = $context->getConfig(); |
| 57 | 57 | $session = $context->getSession(); |
| 58 | 58 | |
| 59 | - $this->addCsrf( $view ); |
|
| 60 | - $this->addAccess( $view, $context ); |
|
| 61 | - $this->addConfig( $view, $config ); |
|
| 62 | - $this->addNumber( $view, $config ); |
|
| 63 | - $this->addParam( $view ); |
|
| 64 | - $this->addRequest( $view ); |
|
| 65 | - $this->addResponse( $view ); |
|
| 66 | - $this->addSession( $view, $session ); |
|
| 67 | - $this->addTranslate( $view, $locale ); |
|
| 68 | - $this->addUrl( $view ); |
|
| 59 | + $this->addCsrf($view); |
|
| 60 | + $this->addAccess($view, $context); |
|
| 61 | + $this->addConfig($view, $config); |
|
| 62 | + $this->addNumber($view, $config); |
|
| 63 | + $this->addParam($view); |
|
| 64 | + $this->addRequest($view); |
|
| 65 | + $this->addResponse($view); |
|
| 66 | + $this->addSession($view, $session); |
|
| 67 | + $this->addTranslate($view, $locale); |
|
| 68 | + $this->addUrl($view); |
|
| 69 | 69 | |
| 70 | - $this->initTwig( $view, $twig ); |
|
| 70 | + $this->initTwig($view, $twig); |
|
| 71 | 71 | |
| 72 | 72 | return $view; |
| 73 | 73 | } |
@@ -80,26 +80,26 @@ discard block |
||
| 80 | 80 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 81 | 81 | * @return \Aimeos\MW\View\Iface Modified view object |
| 82 | 82 | */ |
| 83 | - protected function addAccess( \Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 83 | + protected function addAccess(\Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context) |
|
| 84 | 84 | { |
| 85 | 85 | $container = $this->container; |
| 86 | - $token = $this->container->get( 'security.token_storage' )->getToken(); |
|
| 86 | + $token = $this->container->get('security.token_storage')->getToken(); |
|
| 87 | 87 | |
| 88 | - if( is_object( $token ) && is_object( $token->getUser() ) |
|
| 89 | - && in_array( 'ROLE_ADMIN', (array) $token->getUser()->getRoles() ) ) |
|
| 88 | + if (is_object($token) && is_object($token->getUser()) |
|
| 89 | + && in_array('ROLE_ADMIN', (array) $token->getUser()->getRoles())) |
|
| 90 | 90 | { |
| 91 | - $helper = new \Aimeos\MW\View\Helper\Access\All( $view ); |
|
| 91 | + $helper = new \Aimeos\MW\View\Helper\Access\All($view); |
|
| 92 | 92 | } |
| 93 | 93 | else |
| 94 | 94 | { |
| 95 | - $fcn = function() use ( $container, $context ) { |
|
| 96 | - return $container->get( 'aimeos_support' )->getGroups( $context ); |
|
| 95 | + $fcn = function() use ($container, $context) { |
|
| 96 | + return $container->get('aimeos_support')->getGroups($context); |
|
| 97 | 97 | }; |
| 98 | 98 | |
| 99 | - $helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn ); |
|
| 99 | + $helper = new \Aimeos\MW\View\Helper\Access\Standard($view, $fcn); |
|
| 100 | 100 | } |
| 101 | 101 | |
| 102 | - $view->addHelper( 'access', $helper ); |
|
| 102 | + $view->addHelper('access', $helper); |
|
| 103 | 103 | |
| 104 | 104 | return $view; |
| 105 | 105 | } |
@@ -112,11 +112,11 @@ discard block |
||
| 112 | 112 | * @param \Aimeos\MW\Config\Iface $config Configuration object |
| 113 | 113 | * @return \Aimeos\MW\View\Iface Modified view object |
| 114 | 114 | */ |
| 115 | - protected function addConfig( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config ) |
|
| 115 | + protected function addConfig(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config) |
|
| 116 | 116 | { |
| 117 | - $config = new \Aimeos\MW\Config\Decorator\Protect( clone $config, array( 'admin', 'client' ) ); |
|
| 118 | - $helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config ); |
|
| 119 | - $view->addHelper( 'config', $helper ); |
|
| 117 | + $config = new \Aimeos\MW\Config\Decorator\Protect(clone $config, array('admin', 'client')); |
|
| 118 | + $helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config); |
|
| 119 | + $view->addHelper('config', $helper); |
|
| 120 | 120 | |
| 121 | 121 | return $view; |
| 122 | 122 | } |
@@ -128,11 +128,11 @@ discard block |
||
| 128 | 128 | * @param \Aimeos\MW\View\Iface $view View object |
| 129 | 129 | * @return \Aimeos\MW\View\Iface Modified view object |
| 130 | 130 | */ |
| 131 | - protected function addCsrf( \Aimeos\MW\View\Iface $view ) |
|
| 131 | + protected function addCsrf(\Aimeos\MW\View\Iface $view) |
|
| 132 | 132 | { |
| 133 | - $token = $this->container->get( 'security.csrf.token_manager' )->getToken( '_token' ); |
|
| 134 | - $helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', $token->getValue() ); |
|
| 135 | - $view->addHelper( 'csrf', $helper ); |
|
| 133 | + $token = $this->container->get('security.csrf.token_manager')->getToken('_token'); |
|
| 134 | + $helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', $token->getValue()); |
|
| 135 | + $view->addHelper('csrf', $helper); |
|
| 136 | 136 | |
| 137 | 137 | return $view; |
| 138 | 138 | } |
@@ -145,14 +145,14 @@ discard block |
||
| 145 | 145 | * @param \Aimeos\MW\Config\Iface $config Configuration object |
| 146 | 146 | * @return \Aimeos\MW\View\Iface Modified view object |
| 147 | 147 | */ |
| 148 | - protected function addNumber( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config ) |
|
| 148 | + protected function addNumber(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config) |
|
| 149 | 149 | { |
| 150 | - $sepDec = $config->get( 'client/html/common/format/separatorDecimal', '.' ); |
|
| 151 | - $sep1000 = $config->get( 'client/html/common/format/separator1000', ' ' ); |
|
| 152 | - $decimals = $config->get( 'client/html/common/format/decimals', 2 ); |
|
| 150 | + $sepDec = $config->get('client/html/common/format/separatorDecimal', '.'); |
|
| 151 | + $sep1000 = $config->get('client/html/common/format/separator1000', ' '); |
|
| 152 | + $decimals = $config->get('client/html/common/format/decimals', 2); |
|
| 153 | 153 | |
| 154 | - $helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000, $decimals ); |
|
| 155 | - $view->addHelper( 'number', $helper ); |
|
| 154 | + $helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000, $decimals); |
|
| 155 | + $view->addHelper('number', $helper); |
|
| 156 | 156 | |
| 157 | 157 | return $view; |
| 158 | 158 | } |
@@ -164,17 +164,17 @@ discard block |
||
| 164 | 164 | * @param \Aimeos\MW\View\Iface $view View object |
| 165 | 165 | * @return \Aimeos\MW\View\Iface Modified view object |
| 166 | 166 | */ |
| 167 | - protected function addParam( \Aimeos\MW\View\Iface $view ) |
|
| 167 | + protected function addParam(\Aimeos\MW\View\Iface $view) |
|
| 168 | 168 | { |
| 169 | 169 | $params = array(); |
| 170 | 170 | $request = $this->requestStack->getMasterRequest(); |
| 171 | 171 | |
| 172 | - if( $request !== null ) { |
|
| 173 | - $params = $request->request->all() + $request->query->all() + $request->attributes->get( '_route_params' ); |
|
| 172 | + if ($request !== null) { |
|
| 173 | + $params = $request->request->all() + $request->query->all() + $request->attributes->get('_route_params'); |
|
| 174 | 174 | } |
| 175 | 175 | |
| 176 | - $helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params ); |
|
| 177 | - $view->addHelper( 'param', $helper ); |
|
| 176 | + $helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params); |
|
| 177 | + $view->addHelper('param', $helper); |
|
| 178 | 178 | |
| 179 | 179 | return $view; |
| 180 | 180 | } |
@@ -186,14 +186,14 @@ discard block |
||
| 186 | 186 | * @param \Aimeos\MW\View\Iface $view View object |
| 187 | 187 | * @return \Aimeos\MW\View\Iface Modified view object |
| 188 | 188 | */ |
| 189 | - protected function addRequest( \Aimeos\MW\View\Iface $view ) |
|
| 189 | + protected function addRequest(\Aimeos\MW\View\Iface $view) |
|
| 190 | 190 | { |
| 191 | 191 | $request = $this->requestStack->getMasterRequest(); |
| 192 | 192 | |
| 193 | - if( $request !== null ) |
|
| 193 | + if ($request !== null) |
|
| 194 | 194 | { |
| 195 | - $helper = new \Aimeos\MW\View\Helper\Request\Symfony2( $view, $request ); |
|
| 196 | - $view->addHelper( 'request', $helper ); |
|
| 195 | + $helper = new \Aimeos\MW\View\Helper\Request\Symfony2($view, $request); |
|
| 196 | + $view->addHelper('request', $helper); |
|
| 197 | 197 | } |
| 198 | 198 | |
| 199 | 199 | return $view; |
@@ -206,10 +206,10 @@ discard block |
||
| 206 | 206 | * @param \Aimeos\MW\View\Iface $view View object |
| 207 | 207 | * @return \Aimeos\MW\View\Iface Modified view object |
| 208 | 208 | */ |
| 209 | - protected function addResponse( \Aimeos\MW\View\Iface $view ) |
|
| 209 | + protected function addResponse(\Aimeos\MW\View\Iface $view) |
|
| 210 | 210 | { |
| 211 | - $helper = new \Aimeos\MW\View\Helper\Response\Symfony2( $view ); |
|
| 212 | - $view->addHelper( 'response', $helper ); |
|
| 211 | + $helper = new \Aimeos\MW\View\Helper\Response\Symfony2($view); |
|
| 212 | + $view->addHelper('response', $helper); |
|
| 213 | 213 | |
| 214 | 214 | return $view; |
| 215 | 215 | } |
@@ -222,10 +222,10 @@ discard block |
||
| 222 | 222 | * @param \Aimeos\MW\Session\Iface $session Session object |
| 223 | 223 | * @return \Aimeos\MW\View\Iface Modified view object |
| 224 | 224 | */ |
| 225 | - protected function addSession( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Session\Iface $session ) |
|
| 225 | + protected function addSession(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Session\Iface $session) |
|
| 226 | 226 | { |
| 227 | - $helper = new \Aimeos\MW\View\Helper\Session\Standard( $view, $session ); |
|
| 228 | - $view->addHelper( 'session', $helper ); |
|
| 227 | + $helper = new \Aimeos\MW\View\Helper\Session\Standard($view, $session); |
|
| 228 | + $view->addHelper('session', $helper); |
|
| 229 | 229 | |
| 230 | 230 | return $view; |
| 231 | 231 | } |
@@ -238,20 +238,20 @@ discard block |
||
| 238 | 238 | * @param string|null $locale ISO language code, e.g. "de" or "de_CH" |
| 239 | 239 | * @return \Aimeos\MW\View\Iface Modified view object |
| 240 | 240 | */ |
| 241 | - protected function addTranslate( \Aimeos\MW\View\Iface $view, $locale ) |
|
| 241 | + protected function addTranslate(\Aimeos\MW\View\Iface $view, $locale) |
|
| 242 | 242 | { |
| 243 | - if( $locale !== null ) |
|
| 243 | + if ($locale !== null) |
|
| 244 | 244 | { |
| 245 | - $i18n = $this->container->get( 'aimeos_i18n' )->get( array( $locale ) ); |
|
| 245 | + $i18n = $this->container->get('aimeos_i18n')->get(array($locale)); |
|
| 246 | 246 | $translation = $i18n[$locale]; |
| 247 | 247 | } |
| 248 | 248 | else |
| 249 | 249 | { |
| 250 | - $translation = new \Aimeos\MW\Translation\None( 'en' ); |
|
| 250 | + $translation = new \Aimeos\MW\Translation\None('en'); |
|
| 251 | 251 | } |
| 252 | 252 | |
| 253 | - $helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation ); |
|
| 254 | - $view->addHelper( 'translate', $helper ); |
|
| 253 | + $helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation); |
|
| 254 | + $view->addHelper('translate', $helper); |
|
| 255 | 255 | |
| 256 | 256 | return $view; |
| 257 | 257 | } |
@@ -263,30 +263,30 @@ discard block |
||
| 263 | 263 | * @param \Aimeos\MW\View\Iface $view View object |
| 264 | 264 | * @return \Aimeos\MW\View\Iface Modified view object |
| 265 | 265 | */ |
| 266 | - protected function addUrl( \Aimeos\MW\View\Iface $view ) |
|
| 266 | + protected function addUrl(\Aimeos\MW\View\Iface $view) |
|
| 267 | 267 | { |
| 268 | 268 | $fixed = array(); |
| 269 | 269 | $request = $this->requestStack->getMasterRequest(); |
| 270 | 270 | |
| 271 | - if( $request !== null ) |
|
| 271 | + if ($request !== null) |
|
| 272 | 272 | { |
| 273 | 273 | $attr = $request->attributes; |
| 274 | 274 | |
| 275 | - if( ( $site = $attr->get( 'site' ) ) !== null ) { |
|
| 275 | + if (($site = $attr->get('site')) !== null) { |
|
| 276 | 276 | $fixed['site'] = $site; |
| 277 | 277 | } |
| 278 | 278 | |
| 279 | - if( ( $lang = $attr->get( 'locale' ) ) !== null ) { |
|
| 279 | + if (($lang = $attr->get('locale')) !== null) { |
|
| 280 | 280 | $fixed['locale'] = $lang; |
| 281 | 281 | } |
| 282 | 282 | |
| 283 | - if( ( $currency = $attr->get( 'currency' ) ) !== null ) { |
|
| 283 | + if (($currency = $attr->get('currency')) !== null) { |
|
| 284 | 284 | $fixed['currency'] = $currency; |
| 285 | 285 | } |
| 286 | 286 | } |
| 287 | 287 | |
| 288 | - $helper = new \Aimeos\MW\View\Helper\Url\Symfony2( $view, $this->container->get( 'router' ), $fixed ); |
|
| 289 | - $view->addHelper( 'url', $helper ); |
|
| 288 | + $helper = new \Aimeos\MW\View\Helper\Url\Symfony2($view, $this->container->get('router'), $fixed); |
|
| 289 | + $view->addHelper('url', $helper); |
|
| 290 | 290 | |
| 291 | 291 | return $view; |
| 292 | 292 | } |
@@ -298,21 +298,21 @@ discard block |
||
| 298 | 298 | * @param \Aimeos\MW\View\Iface $view View object |
| 299 | 299 | * @param \Twig_Environment $twig Twig environment object |
| 300 | 300 | */ |
| 301 | - protected function initTwig( \Aimeos\MW\View\Iface $view, \Twig_Environment $twig ) |
|
| 301 | + protected function initTwig(\Aimeos\MW\View\Iface $view, \Twig_Environment $twig) |
|
| 302 | 302 | { |
| 303 | - $fcn = function( $key, $default = null ) use ( $view ) { |
|
| 304 | - return $view->config( $key, $default ); |
|
| 303 | + $fcn = function($key, $default = null) use ($view) { |
|
| 304 | + return $view->config($key, $default); |
|
| 305 | 305 | }; |
| 306 | - $twig->addFunction( new \Twig_SimpleFunction( 'aiconfig', $fcn ) ); |
|
| 306 | + $twig->addFunction(new \Twig_SimpleFunction('aiconfig', $fcn)); |
|
| 307 | 307 | |
| 308 | - $fcn = function( $singular, array $values = array(), $domain = 'client' ) use ( $view ) { |
|
| 309 | - return vsprintf( $view->translate( $domain, $singular ), $values ); |
|
| 308 | + $fcn = function($singular, array $values = array(), $domain = 'client') use ($view) { |
|
| 309 | + return vsprintf($view->translate($domain, $singular), $values); |
|
| 310 | 310 | }; |
| 311 | - $twig->addFunction( new \Twig_SimpleFunction( 'aitrans', $fcn ) ); |
|
| 311 | + $twig->addFunction(new \Twig_SimpleFunction('aitrans', $fcn)); |
|
| 312 | 312 | |
| 313 | - $fcn = function( $singular, $plural, $number, array $values = array(), $domain = 'client' ) use ( $view ) { |
|
| 314 | - return vsprintf( $view->translate( $domain, $singular, $plural, $number ), $values ); |
|
| 313 | + $fcn = function($singular, $plural, $number, array $values = array(), $domain = 'client') use ($view) { |
|
| 314 | + return vsprintf($view->translate($domain, $singular, $plural, $number), $values); |
|
| 315 | 315 | }; |
| 316 | - $twig->addFunction( new \Twig_SimpleFunction( 'aitransplural', $fcn ) ); |
|
| 316 | + $twig->addFunction(new \Twig_SimpleFunction('aitransplural', $fcn)); |
|
| 317 | 317 | } |
| 318 | 318 | } |