@@ -28,8 +28,8 @@ discard block |
||
| 28 | 28 | */ |
| 29 | 29 | public function confirmAction() |
| 30 | 30 | { |
| 31 | - $params = $this->get( 'aimeos_page' )->getSections( 'checkout-confirm' ); |
|
| 32 | - return $this->render( 'AimeosShopBundle:Checkout:confirm.html.twig', $params ); |
|
| 31 | + $params = $this->get('aimeos_page')->getSections('checkout-confirm'); |
|
| 32 | + return $this->render('AimeosShopBundle:Checkout:confirm.html.twig', $params); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | |
@@ -40,8 +40,8 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | public function indexAction() |
| 42 | 42 | { |
| 43 | - $params = $this->get( 'aimeos_page' )->getSections( 'checkout-index' ); |
|
| 44 | - return $this->render( 'AimeosShopBundle:Checkout:index.html.twig', $params ); |
|
| 43 | + $params = $this->get('aimeos_page')->getSections('checkout-index'); |
|
| 44 | + return $this->render('AimeosShopBundle:Checkout:index.html.twig', $params); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | */ |
| 53 | 53 | public function updateAction() |
| 54 | 54 | { |
| 55 | - $params = $this->get( 'aimeos_page' )->getSections( 'checkout-update' ); |
|
| 56 | - return $this->render( 'AimeosShopBundle:Checkout:update.html.twig', $params ); |
|
| 55 | + $params = $this->get('aimeos_page')->getSections('checkout-update'); |
|
| 56 | + return $this->render('AimeosShopBundle:Checkout:update.html.twig', $params); |
|
| 57 | 57 | } |
| 58 | 58 | } |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | public function indexAction() |
| 30 | 30 | { |
| 31 | - $params = $this->get( 'aimeos_page' )->getSections( 'basket-index' ); |
|
| 32 | - return $this->render( 'AimeosShopBundle:Basket:index.html.twig', $params ); |
|
| 31 | + $params = $this->get('aimeos_page')->getSections('basket-index'); |
|
| 32 | + return $this->render('AimeosShopBundle:Basket:index.html.twig', $params); |
|
| 33 | 33 | } |
| 34 | 34 | } |
@@ -28,8 +28,8 @@ discard block |
||
| 28 | 28 | */ |
| 29 | 29 | public function countAction() |
| 30 | 30 | { |
| 31 | - $params = $this->get( 'aimeos_page' )->getSections( 'catalog-count' ); |
|
| 32 | - return $this->render( 'AimeosShopBundle:Catalog:count.html.twig', $params ); |
|
| 31 | + $params = $this->get('aimeos_page')->getSections('catalog-count'); |
|
| 32 | + return $this->render('AimeosShopBundle:Catalog:count.html.twig', $params); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | |
@@ -40,8 +40,8 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | public function detailAction() |
| 42 | 42 | { |
| 43 | - $params = $this->get( 'aimeos_page' )->getSections( 'catalog-detail' ); |
|
| 44 | - return $this->render( 'AimeosShopBundle:Catalog:detail.html.twig', $params ); |
|
| 43 | + $params = $this->get('aimeos_page')->getSections('catalog-detail'); |
|
| 44 | + return $this->render('AimeosShopBundle:Catalog:detail.html.twig', $params); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | |
@@ -52,8 +52,8 @@ discard block |
||
| 52 | 52 | */ |
| 53 | 53 | public function listAction() |
| 54 | 54 | { |
| 55 | - $params = $this->get( 'aimeos_page' )->getSections( 'catalog-list' ); |
|
| 56 | - return $this->render( 'AimeosShopBundle:Catalog:list.html.twig', $params ); |
|
| 55 | + $params = $this->get('aimeos_page')->getSections('catalog-list'); |
|
| 56 | + return $this->render('AimeosShopBundle:Catalog:list.html.twig', $params); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | |
@@ -64,8 +64,8 @@ discard block |
||
| 64 | 64 | */ |
| 65 | 65 | public function stockAction() |
| 66 | 66 | { |
| 67 | - $params = $this->get( 'aimeos_page' )->getSections( 'catalog-stock' ); |
|
| 68 | - return $this->render( 'AimeosShopBundle:Catalog:stock.html.twig', $params ); |
|
| 67 | + $params = $this->get('aimeos_page')->getSections('catalog-stock'); |
|
| 68 | + return $this->render('AimeosShopBundle:Catalog:stock.html.twig', $params); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | */ |
| 77 | 77 | public function suggestAction() |
| 78 | 78 | { |
| 79 | - $params = $this->get( 'aimeos_page' )->getSections( 'catalog-suggest' ); |
|
| 80 | - return $this->render( 'AimeosShopBundle:Catalog:suggest.html.twig', $params ); |
|
| 79 | + $params = $this->get('aimeos_page')->getSections('catalog-suggest'); |
|
| 80 | + return $this->render('AimeosShopBundle:Catalog:suggest.html.twig', $params); |
|
| 81 | 81 | } |
| 82 | 82 | } |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | public function indexAction() |
| 30 | 30 | { |
| 31 | - $params = $this->get( 'aimeos_page' )->getSections( 'account-index' ); |
|
| 32 | - return $this->render( 'AimeosShopBundle:Account:index.html.twig', $params ); |
|
| 31 | + $params = $this->get('aimeos_page')->getSections('account-index'); |
|
| 32 | + return $this->render('AimeosShopBundle:Account:index.html.twig', $params); |
|
| 33 | 33 | } |
| 34 | 34 | } |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | */ |
| 29 | 29 | public function privacyAction() |
| 30 | 30 | { |
| 31 | - return $this->render( 'AimeosShopBundle:Page:privacy.html.twig' ); |
|
| 31 | + return $this->render('AimeosShopBundle:Page:privacy.html.twig'); |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | |
@@ -39,6 +39,6 @@ discard block |
||
| 39 | 39 | */ |
| 40 | 40 | public function termsAction() |
| 41 | 41 | { |
| 42 | - return $this->render( 'AimeosShopBundle:Page:terms.html.twig' ); |
|
| 42 | + return $this->render('AimeosShopBundle:Page:terms.html.twig'); |
|
| 43 | 43 | } |
| 44 | 44 | } |
@@ -45,5 +45,5 @@ |
||
| 45 | 45 | ; |
| 46 | 46 | |
| 47 | 47 | return $treeBuilder; |
| 48 | - } |
|
| 48 | + } |
|
| 49 | 49 | } |
@@ -25,22 +25,22 @@ |
||
| 25 | 25 | public function getConfigTreeBuilder() |
| 26 | 26 | { |
| 27 | 27 | $treeBuilder = new TreeBuilder(); |
| 28 | - $rootNode = $treeBuilder->root( 'aimeos_shop' ); |
|
| 28 | + $rootNode = $treeBuilder->root('aimeos_shop'); |
|
| 29 | 29 | |
| 30 | 30 | $rootNode |
| 31 | 31 | ->children() |
| 32 | - ->booleanNode('disable_sites')->defaultValue( true )->end() |
|
| 33 | - ->booleanNode('apc_enable')->defaultValue( false )->end() |
|
| 34 | - ->scalarNode('apc_prefix')->defaultValue( 'sf2:' )->end() |
|
| 32 | + ->booleanNode('disable_sites')->defaultValue(true)->end() |
|
| 33 | + ->booleanNode('apc_enable')->defaultValue(false)->end() |
|
| 34 | + ->scalarNode('apc_prefix')->defaultValue('sf2:')->end() |
|
| 35 | 35 | ->scalarNode('extdir')->end() |
| 36 | 36 | ->scalarNode('uploaddir')->end() |
| 37 | - ->variableNode('client')->defaultValue( array() )->end() |
|
| 38 | - ->variableNode('controller')->defaultValue( array() )->end() |
|
| 39 | - ->variableNode('i18n')->defaultValue( array() )->end() |
|
| 40 | - ->variableNode('madmin')->defaultValue( array() )->end() |
|
| 41 | - ->variableNode('mshop')->defaultValue( array() )->end() |
|
| 42 | - ->variableNode('resource')->defaultValue( array() )->end() |
|
| 43 | - ->variableNode('page')->defaultValue( array() )->end() |
|
| 37 | + ->variableNode('client')->defaultValue(array())->end() |
|
| 38 | + ->variableNode('controller')->defaultValue(array())->end() |
|
| 39 | + ->variableNode('i18n')->defaultValue(array())->end() |
|
| 40 | + ->variableNode('madmin')->defaultValue(array())->end() |
|
| 41 | + ->variableNode('mshop')->defaultValue(array())->end() |
|
| 42 | + ->variableNode('resource')->defaultValue(array())->end() |
|
| 43 | + ->variableNode('page')->defaultValue(array())->end() |
|
| 44 | 44 | ->end() |
| 45 | 45 | ; |
| 46 | 46 | |
@@ -27,21 +27,21 @@ discard block |
||
| 27 | 27 | /** |
| 28 | 28 | * {@inheritDoc} |
| 29 | 29 | */ |
| 30 | - public function load( array $configs, ContainerBuilder $container ) |
|
| 30 | + public function load(array $configs, ContainerBuilder $container) |
|
| 31 | 31 | { |
| 32 | 32 | $configuration = new Configuration(); |
| 33 | - $config = $this->processConfiguration( $configuration, $configs ); |
|
| 33 | + $config = $this->processConfiguration($configuration, $configs); |
|
| 34 | 34 | |
| 35 | - foreach( $configs as $list ) { |
|
| 36 | - $this->merge( $config, $list ); |
|
| 35 | + foreach ($configs as $list) { |
|
| 36 | + $this->merge($config, $list); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | - foreach( $config as $key => $value ) { |
|
| 40 | - $container->setParameter( 'aimeos_shop.' . $key, $value ); |
|
| 39 | + foreach ($config as $key => $value) { |
|
| 40 | + $container->setParameter('aimeos_shop.' . $key, $value); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | - $loader = new Loader\YamlFileLoader( $container, new FileLocator( dirname( __DIR__ ) . '/Resources/config' ) ); |
|
| 44 | - $loader->load( 'services.yml' ); |
|
| 43 | + $loader = new Loader\YamlFileLoader($container, new FileLocator(dirname(__DIR__) . '/Resources/config')); |
|
| 44 | + $loader->load('services.yml'); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | |
@@ -50,13 +50,13 @@ discard block |
||
| 50 | 50 | * |
| 51 | 51 | * @param ContainerBuilder $container ContainerBuilder object |
| 52 | 52 | */ |
| 53 | - public function prepend( ContainerBuilder $container ) |
|
| 53 | + public function prepend(ContainerBuilder $container) |
|
| 54 | 54 | { |
| 55 | - $configFile = dirname( __DIR__ ) . '/Resources/config/aimeos_shop.yml'; |
|
| 56 | - $config = Yaml::parse( file_get_contents( $configFile ) ); |
|
| 55 | + $configFile = dirname(__DIR__) . '/Resources/config/aimeos_shop.yml'; |
|
| 56 | + $config = Yaml::parse(file_get_contents($configFile)); |
|
| 57 | 57 | |
| 58 | - $container->prependExtensionConfig( 'aimeos_shop', $config ); |
|
| 59 | - $container->addResource( new FileResource( $configFile ) ); |
|
| 58 | + $container->prependExtensionConfig('aimeos_shop', $config); |
|
| 59 | + $container->addResource(new FileResource($configFile)); |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | |
@@ -66,15 +66,15 @@ discard block |
||
| 66 | 66 | * @param array &$original Associative list of original values |
| 67 | 67 | * @param array $overrule Associative list of new values |
| 68 | 68 | */ |
| 69 | - protected function merge( array &$original, array $overrule ) |
|
| 69 | + protected function merge(array &$original, array $overrule) |
|
| 70 | 70 | { |
| 71 | - foreach( array_keys( $overrule ) as $key ) |
|
| 71 | + foreach (array_keys($overrule) as $key) |
|
| 72 | 72 | { |
| 73 | - if( isset( $original[$key] ) && is_array( $original[$key] ) ) { |
|
| 74 | - if( is_array( $overrule[$key] ) ) { |
|
| 75 | - $this->merge( $original[$key], $overrule[$key] ); |
|
| 73 | + if (isset($original[$key]) && is_array($original[$key])) { |
|
| 74 | + if (is_array($overrule[$key])) { |
|
| 75 | + $this->merge($original[$key], $overrule[$key]); |
|
| 76 | 76 | } |
| 77 | - } elseif( isset( $overrule[$key] ) ) { |
|
| 77 | + } elseif (isset($overrule[$key])) { |
|
| 78 | 78 | $original[$key] = $overrule[$key]; |
| 79 | 79 | } |
| 80 | 80 | } |
@@ -25,15 +25,15 @@ |
||
| 25 | 25 | * @param InputInterface $input Input object |
| 26 | 26 | * @return \Aimeos\MShop\Locale\Item\Site\Interface[] List of site items |
| 27 | 27 | */ |
| 28 | - protected function getSiteItems( \Aimeos\MShop\Context\Item\Iface $context, InputInterface $input ) |
|
| 28 | + protected function getSiteItems(\Aimeos\MShop\Context\Item\Iface $context, InputInterface $input) |
|
| 29 | 29 | { |
| 30 | - $manager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context )->getSubManager( 'site' ); |
|
| 30 | + $manager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context)->getSubManager('site'); |
|
| 31 | 31 | $search = $manager->createSearch(); |
| 32 | 32 | |
| 33 | - if( ( $codes = (string) $input->getArgument( 'site' ) ) !== '' ) { |
|
| 34 | - $search->setConditions( $search->compare( '==', 'locale.site.code', explode( ' ', $codes ) ) ); |
|
| 33 | + if (($codes = (string) $input->getArgument('site')) !== '') { |
|
| 34 | + $search->setConditions($search->compare('==', 'locale.site.code', explode(' ', $codes))); |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | - return $manager->searchItems( $search ); |
|
| 37 | + return $manager->searchItems($search); |
|
| 38 | 38 | } |
| 39 | 39 | } |
@@ -23,9 +23,9 @@ discard block |
||
| 23 | 23 | */ |
| 24 | 24 | protected function configure() |
| 25 | 25 | { |
| 26 | - $this->setName( 'aimeos:cache' ); |
|
| 27 | - $this->setDescription( 'Clears the content cache' ); |
|
| 28 | - $this->addArgument( 'site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)' ); |
|
| 26 | + $this->setName('aimeos:cache'); |
|
| 27 | + $this->setDescription('Clears the content cache'); |
|
| 28 | + $this->addArgument('site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)'); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | |
@@ -35,26 +35,26 @@ discard block |
||
| 35 | 35 | * @param InputInterface $input Input object |
| 36 | 36 | * @param OutputInterface $output Output object |
| 37 | 37 | */ |
| 38 | - protected function execute( InputInterface $input, OutputInterface $output ) |
|
| 38 | + protected function execute(InputInterface $input, OutputInterface $output) |
|
| 39 | 39 | { |
| 40 | - $context = $this->getContainer()->get( 'aimeos_context' )->get( false ); |
|
| 41 | - $context->setEditor( 'aimeos:cache' ); |
|
| 40 | + $context = $this->getContainer()->get('aimeos_context')->get(false); |
|
| 41 | + $context->setEditor('aimeos:cache'); |
|
| 42 | 42 | |
| 43 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
| 43 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
| 44 | 44 | |
| 45 | - foreach( $this->getSiteItems( $context, $input ) as $siteItem ) |
|
| 45 | + foreach ($this->getSiteItems($context, $input) as $siteItem) |
|
| 46 | 46 | { |
| 47 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
| 47 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
| 48 | 48 | |
| 49 | 49 | $lcontext = clone $context; |
| 50 | - $lcontext->setLocale( $localeItem ); |
|
| 50 | + $lcontext->setLocale($localeItem); |
|
| 51 | 51 | |
| 52 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext ); |
|
| 53 | - $lcontext->setCache( $cache ); |
|
| 52 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext); |
|
| 53 | + $lcontext->setCache($cache); |
|
| 54 | 54 | |
| 55 | - $output->writeln( sprintf( 'Clearing the Aimeos cache for site <info>%1$s</info>', $siteItem->getCode() ) ); |
|
| 55 | + $output->writeln(sprintf('Clearing the Aimeos cache for site <info>%1$s</info>', $siteItem->getCode())); |
|
| 56 | 56 | |
| 57 | - \Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->flush(); |
|
| 57 | + \Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->flush(); |
|
| 58 | 58 | } |
| 59 | 59 | } |
| 60 | 60 | } |