@@ -25,18 +25,18 @@ discard block |
||
| 25 | 25 | * @param CommandEvent $event CommandEvent instance |
| 26 | 26 | * @throws \RuntimeException If an error occured |
| 27 | 27 | */ |
| 28 | - public static function setupDatabase( CommandEvent $event ) |
|
| 28 | + public static function setupDatabase(CommandEvent $event) |
|
| 29 | 29 | { |
| 30 | 30 | $options = $env = array(); |
| 31 | 31 | |
| 32 | - if( $event->isDevMode() ) { |
|
| 32 | + if ($event->isDevMode()) { |
|
| 33 | 33 | $options[] = '--option=setup/default/demo:1'; |
| 34 | 34 | } else { |
| 35 | 35 | $env[] = '--env=prod'; |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - self::executeCommand( $event, 'aimeos:setup', $options + $env ); |
|
| 39 | - self::executeCommand( $event, 'aimeos:cache', $env ); |
|
| 38 | + self::executeCommand($event, 'aimeos:setup', $options + $env); |
|
| 39 | + self::executeCommand($event, 'aimeos:cache', $env); |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | |
@@ -46,27 +46,27 @@ discard block |
||
| 46 | 46 | * @param CommandEvent $event CommandEvent instance |
| 47 | 47 | * @throws \RuntimeException If an error occured |
| 48 | 48 | */ |
| 49 | - public static function installBundle( CommandEvent $event ) |
|
| 49 | + public static function installBundle(CommandEvent $event) |
|
| 50 | 50 | { |
| 51 | - $event->getIO()->write( 'Installing the Aimeos shop bundle' ); |
|
| 51 | + $event->getIO()->write('Installing the Aimeos shop bundle'); |
|
| 52 | 52 | |
| 53 | - $options = self::getOptions( $event ); |
|
| 53 | + $options = self::getOptions($event); |
|
| 54 | 54 | |
| 55 | - if( !isset( $options['symfony-app-dir'] ) || !is_dir( $options['symfony-app-dir'] ) ) |
|
| 55 | + if (!isset($options['symfony-app-dir']) || !is_dir($options['symfony-app-dir'])) |
|
| 56 | 56 | { |
| 57 | 57 | $msg = 'An error occurred because the "%1$s" option or the "%2$s" directory isn\'t available'; |
| 58 | - throw new \RuntimeException( sprintf( $msg, 'symfony-app-dir', $options['symfony-app-dir'] ) ); |
|
| 58 | + throw new \RuntimeException(sprintf($msg, 'symfony-app-dir', $options['symfony-app-dir'])); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | - if( !isset( $options['symfony-web-dir'] ) || !is_dir( $options['symfony-web-dir'] ) ) |
|
| 61 | + if (!isset($options['symfony-web-dir']) || !is_dir($options['symfony-web-dir'])) |
|
| 62 | 62 | { |
| 63 | 63 | $msg = 'An error occurred because the "%1$s" option or the "%2$s" directory isn\'t available'; |
| 64 | - throw new \RuntimeException( sprintf( $msg, 'symfony-web-dir', $options['symfony-web-dir'] ) ); |
|
| 64 | + throw new \RuntimeException(sprintf($msg, 'symfony-web-dir', $options['symfony-web-dir'])); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | - self::updateConfigFile( $options['symfony-app-dir'] . '/config/config.yml' ); |
|
| 68 | - self::updateRoutingFile( $options['symfony-app-dir'] . '/config/routing.yml' ); |
|
| 69 | - self::createDirectory( $options['symfony-web-dir'] . '/uploads' ); |
|
| 67 | + self::updateConfigFile($options['symfony-app-dir'] . '/config/config.yml'); |
|
| 68 | + self::updateRoutingFile($options['symfony-app-dir'] . '/config/routing.yml'); |
|
| 69 | + self::createDirectory($options['symfony-web-dir'] . '/uploads'); |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | |
@@ -76,14 +76,14 @@ discard block |
||
| 76 | 76 | * @param string $dir Absolute path of the new directory |
| 77 | 77 | * @throws \RuntimeException If directory couldn't be created |
| 78 | 78 | */ |
| 79 | - protected static function createDirectory( $dir ) |
|
| 79 | + protected static function createDirectory($dir) |
|
| 80 | 80 | { |
| 81 | 81 | $perm = 0755; |
| 82 | 82 | |
| 83 | - if( !is_dir( $dir ) && !mkdir( $dir, $perm, true ) ) |
|
| 83 | + if (!is_dir($dir) && !mkdir($dir, $perm, true)) |
|
| 84 | 84 | { |
| 85 | 85 | $msg = 'Unable to create directory "%1$s" with permission "%2$s"'; |
| 86 | - throw new \RuntimeException( sprintf( $msg, $dir, $perm ) ); |
|
| 86 | + throw new \RuntimeException(sprintf($msg, $dir, $perm)); |
|
| 87 | 87 | } |
| 88 | 88 | } |
| 89 | 89 | |
@@ -96,28 +96,28 @@ discard block |
||
| 96 | 96 | * @param array List of configuration options for the given command |
| 97 | 97 | * @throws \RuntimeException If the command couldn't be executed |
| 98 | 98 | */ |
| 99 | - protected static function executeCommand( CommandEvent $event, $cmd, array $options = array() ) |
|
| 99 | + protected static function executeCommand(CommandEvent $event, $cmd, array $options = array()) |
|
| 100 | 100 | { |
| 101 | - $php = escapeshellarg( self::getPhp() ); |
|
| 102 | - $console = escapeshellarg( self::getConsoleDir( $event ) . '/console' ); |
|
| 103 | - $cmd = escapeshellarg( $cmd ); |
|
| 101 | + $php = escapeshellarg(self::getPhp()); |
|
| 102 | + $console = escapeshellarg(self::getConsoleDir($event) . '/console'); |
|
| 103 | + $cmd = escapeshellarg($cmd); |
|
| 104 | 104 | |
| 105 | - foreach( $options as $key => $option ) { |
|
| 106 | - $options[$key] = escapeshellarg( $option ); |
|
| 105 | + foreach ($options as $key => $option) { |
|
| 106 | + $options[$key] = escapeshellarg($option); |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | - if( $event->getIO()->isDecorated() ) { |
|
| 109 | + if ($event->getIO()->isDecorated()) { |
|
| 110 | 110 | $console .= ' --ansi'; |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | - $process = new Process( $php . ' ' . $console . ' ' . $cmd . ' ' . implode( ' ', $options ), null, null, null, 3600 ); |
|
| 113 | + $process = new Process($php . ' ' . $console . ' ' . $cmd . ' ' . implode(' ', $options), null, null, null, 3600); |
|
| 114 | 114 | |
| 115 | - $process->run( function( $type, $buffer ) use ( $event ) { |
|
| 116 | - $event->getIO()->write( $buffer, false ); |
|
| 115 | + $process->run(function($type, $buffer) use ($event) { |
|
| 116 | + $event->getIO()->write($buffer, false); |
|
| 117 | 117 | } ); |
| 118 | 118 | |
| 119 | - if( !$process->isSuccessful() ) { |
|
| 120 | - throw new \RuntimeException( sprintf( 'An error occurred when executing the "%s" command', escapeshellarg( $cmd ) ) ); |
|
| 119 | + if (!$process->isSuccessful()) { |
|
| 120 | + throw new \RuntimeException(sprintf('An error occurred when executing the "%s" command', escapeshellarg($cmd))); |
|
| 121 | 121 | } |
| 122 | 122 | } |
| 123 | 123 | |
@@ -130,19 +130,19 @@ discard block |
||
| 130 | 130 | * @return string The path to the console directory |
| 131 | 131 | * @throws \RuntimeException If console directory couldn't be found |
| 132 | 132 | */ |
| 133 | - protected static function getConsoleDir( CommandEvent $event ) |
|
| 133 | + protected static function getConsoleDir(CommandEvent $event) |
|
| 134 | 134 | { |
| 135 | - $options = self::getOptions( $event ); |
|
| 135 | + $options = self::getOptions($event); |
|
| 136 | 136 | |
| 137 | - if( isset( $options['symfony-bin-dir'] ) && is_dir( $options['symfony-bin-dir'] ) ) { |
|
| 137 | + if (isset($options['symfony-bin-dir']) && is_dir($options['symfony-bin-dir'])) { |
|
| 138 | 138 | return $options['symfony-bin-dir']; |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | - if( isset( $options['symfony-app-dir'] ) && is_dir( $options['symfony-app-dir'] ) ) { |
|
| 141 | + if (isset($options['symfony-app-dir']) && is_dir($options['symfony-app-dir'])) { |
|
| 142 | 142 | return $options['symfony-app-dir']; |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | - throw new \RuntimeException( sprintf( 'Console directory not found. Neither %1$s nor %2$s option exist', 'symfony-app-dir', 'symfony-bin-dir' ) ); |
|
| 145 | + throw new \RuntimeException(sprintf('Console directory not found. Neither %1$s nor %2$s option exist', 'symfony-app-dir', 'symfony-bin-dir')); |
|
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | * @param CommandEvent $event Command event object |
| 153 | 153 | * @return array Associative list of option keys and values |
| 154 | 154 | */ |
| 155 | - protected static function getOptions( CommandEvent $event ) |
|
| 155 | + protected static function getOptions(CommandEvent $event) |
|
| 156 | 156 | { |
| 157 | 157 | return $event->getComposer()->getPackage()->getExtra(); |
| 158 | 158 | } |
@@ -168,8 +168,8 @@ discard block |
||
| 168 | 168 | { |
| 169 | 169 | $phpFinder = new PhpExecutableFinder; |
| 170 | 170 | |
| 171 | - if( !( $phpPath = $phpFinder->find() ) ) { |
|
| 172 | - throw new \RuntimeException( 'The php executable could not be found, add it to your PATH environment variable and try again' ); |
|
| 171 | + if (!($phpPath = $phpFinder->find())) { |
|
| 172 | + throw new \RuntimeException('The php executable could not be found, add it to your PATH environment variable and try again'); |
|
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | return $phpPath; |
@@ -182,15 +182,15 @@ discard block |
||
| 182 | 182 | * @param string $filename Name of the YAML config file |
| 183 | 183 | * @throws \RuntimeException If file is not found |
| 184 | 184 | */ |
| 185 | - protected static function updateConfigFile( $filename ) |
|
| 185 | + protected static function updateConfigFile($filename) |
|
| 186 | 186 | { |
| 187 | - if( ( $content = file_get_contents( $filename ) ) === false ) { |
|
| 188 | - throw new \RuntimeException( sprintf( 'File "%1$s" not found', $filename ) ); |
|
| 187 | + if (($content = file_get_contents($filename)) === false) { |
|
| 188 | + throw new \RuntimeException(sprintf('File "%1$s" not found', $filename)); |
|
| 189 | 189 | } |
| 190 | 190 | |
| 191 | - if( self::addAsseticBundle( $content ) === true ) { |
|
| 191 | + if (self::addAsseticBundle($content) === true) { |
|
| 192 | 192 | $fs = new Filesystem(); |
| 193 | - $fs->dumpFile( $filename, $content ); |
|
| 193 | + $fs->dumpFile($filename, $content); |
|
| 194 | 194 | } |
| 195 | 195 | } |
| 196 | 196 | |
@@ -201,15 +201,15 @@ discard block |
||
| 201 | 201 | * @param string $filename Name of the YAML config file |
| 202 | 202 | * @throws \RuntimeException If file is not found |
| 203 | 203 | */ |
| 204 | - protected static function updateRoutingFile( $filename ) |
|
| 204 | + protected static function updateRoutingFile($filename) |
|
| 205 | 205 | { |
| 206 | 206 | $update = false; |
| 207 | 207 | |
| 208 | - if( ( $content = file_get_contents( $filename ) ) === false ) { |
|
| 209 | - throw new \RuntimeException( sprintf( 'File "%1$s" not found', $filename ) ); |
|
| 208 | + if (($content = file_get_contents($filename)) === false) { |
|
| 209 | + throw new \RuntimeException(sprintf('File "%1$s" not found', $filename)); |
|
| 210 | 210 | } |
| 211 | 211 | |
| 212 | - if( strpos( $content, 'aimeos_shop:' ) === false ) |
|
| 212 | + if (strpos($content, 'aimeos_shop:') === false) |
|
| 213 | 213 | { |
| 214 | 214 | $content .= "\n" . 'aimeos_shop: |
| 215 | 215 | resource: "@AimeosShopBundle/Resources/config/routing.yml" |
@@ -218,10 +218,10 @@ discard block |
||
| 218 | 218 | $update = true; |
| 219 | 219 | } |
| 220 | 220 | |
| 221 | - if( $update === true ) |
|
| 221 | + if ($update === true) |
|
| 222 | 222 | { |
| 223 | 223 | $fs = new Filesystem(); |
| 224 | - $fs->dumpFile( $filename, $content ); |
|
| 224 | + $fs->dumpFile($filename, $content); |
|
| 225 | 225 | } |
| 226 | 226 | } |
| 227 | 227 | |
@@ -232,14 +232,14 @@ discard block |
||
| 232 | 232 | * @param string &$content Content of the config.yml file |
| 233 | 233 | * @return boolean True if modified, false if not |
| 234 | 234 | */ |
| 235 | - protected static function addAsseticBundle( &$content ) |
|
| 235 | + protected static function addAsseticBundle(&$content) |
|
| 236 | 236 | { |
| 237 | - if( preg_match( "/ bundles:[ ]*\[.*'AimeosShopBundle'.*\]/", $content ) !== 1 ) |
|
| 237 | + if (preg_match("/ bundles:[ ]*\[.*'AimeosShopBundle'.*\]/", $content) !== 1) |
|
| 238 | 238 | { |
| 239 | - $search = array( "/ bundles:[ ]*\[([^\]]+)\]/", "/ bundles:[ ]*\[([ ]*)\]/" ); |
|
| 240 | - $replace = array( " bundles: [$1,'AimeosShopBundle']", " bundles: ['AimeosShopBundle']" ); |
|
| 239 | + $search = array("/ bundles:[ ]*\[([^\]]+)\]/", "/ bundles:[ ]*\[([ ]*)\]/"); |
|
| 240 | + $replace = array(" bundles: [$1,'AimeosShopBundle']", " bundles: ['AimeosShopBundle']"); |
|
| 241 | 241 | |
| 242 | - if( ( $content = preg_replace( $search, $replace, $content ) ) !== null ) { |
|
| 242 | + if (($content = preg_replace($search, $replace, $content)) !== null) { |
|
| 243 | 243 | return true; |
| 244 | 244 | } |
| 245 | 245 | } |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | * |
| 29 | 29 | * @param Container $container Container object to access parameters |
| 30 | 30 | */ |
| 31 | - public function __construct( Container $container ) |
|
| 31 | + public function __construct(Container $container) |
|
| 32 | 32 | { |
| 33 | 33 | $this->container = $container; |
| 34 | 34 | } |
@@ -40,23 +40,23 @@ discard block |
||
| 40 | 40 | * @param string $pageName Name of the configured page |
| 41 | 41 | * @return array Associative list with body and header output separated by client name |
| 42 | 42 | */ |
| 43 | - public function getSections( $pageName ) |
|
| 43 | + public function getSections($pageName) |
|
| 44 | 44 | { |
| 45 | 45 | $context = $this->container->get('aimeos_context')->get(); |
| 46 | - $pagesConfig = $this->container->getParameter( 'aimeos_shop.page' ); |
|
| 47 | - $result = array( 'aibody' => array(), 'aiheader' => array() ); |
|
| 46 | + $pagesConfig = $this->container->getParameter('aimeos_shop.page'); |
|
| 47 | + $result = array('aibody' => array(), 'aiheader' => array()); |
|
| 48 | 48 | |
| 49 | 49 | $langid = $context->getLocale()->getLanguageId(); |
| 50 | - $tmplPaths = $this->container->get('aimeos')->get()->getCustomPaths( 'client/html/templates' ); |
|
| 51 | - $view = $this->container->get('aimeos_view')->create( $context->getConfig(), $tmplPaths, $langid ); |
|
| 52 | - $context->setView( $view ); |
|
| 50 | + $tmplPaths = $this->container->get('aimeos')->get()->getCustomPaths('client/html/templates'); |
|
| 51 | + $view = $this->container->get('aimeos_view')->create($context->getConfig(), $tmplPaths, $langid); |
|
| 52 | + $context->setView($view); |
|
| 53 | 53 | |
| 54 | - if( isset( $pagesConfig[$pageName] ) ) |
|
| 54 | + if (isset($pagesConfig[$pageName])) |
|
| 55 | 55 | { |
| 56 | - foreach( (array) $pagesConfig[$pageName] as $clientName ) |
|
| 56 | + foreach ((array) $pagesConfig[$pageName] as $clientName) |
|
| 57 | 57 | { |
| 58 | - $client = \Aimeos\Client\Html\Factory::createClient( $context, $tmplPaths, $clientName ); |
|
| 59 | - $client->setView( clone $view ); |
|
| 58 | + $client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName); |
|
| 59 | + $client->setView(clone $view); |
|
| 60 | 60 | $client->process(); |
| 61 | 61 | |
| 62 | 62 | $result['aibody'][$clientName] = $client->getBody(); |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | * |
| 30 | 30 | * @param Container $container Container object to access parameters |
| 31 | 31 | */ |
| 32 | - public function __construct( Container $container ) |
|
| 32 | + public function __construct(Container $container) |
|
| 33 | 33 | { |
| 34 | 34 | $this->container = $container; |
| 35 | 35 | } |
@@ -41,27 +41,27 @@ discard block |
||
| 41 | 41 | * @param array $languageIds List of two letter ISO language IDs |
| 42 | 42 | * @return \Aimeos\MW\Translation\Interface[] List of translation objects |
| 43 | 43 | */ |
| 44 | - public function get( array $languageIds ) |
|
| 44 | + public function get(array $languageIds) |
|
| 45 | 45 | { |
| 46 | - $i18nPaths = $this->container->get( 'aimeos' )->get()->getI18nPaths(); |
|
| 46 | + $i18nPaths = $this->container->get('aimeos')->get()->getI18nPaths(); |
|
| 47 | 47 | |
| 48 | - foreach( $languageIds as $langid ) |
|
| 48 | + foreach ($languageIds as $langid) |
|
| 49 | 49 | { |
| 50 | - if( !isset( $this->i18n[$langid] ) ) |
|
| 50 | + if (!isset($this->i18n[$langid])) |
|
| 51 | 51 | { |
| 52 | - $i18n = new \Aimeos\MW\Translation\Zend2( $i18nPaths, 'gettext', $langid, array( 'disableNotices' => true ) ); |
|
| 52 | + $i18n = new \Aimeos\MW\Translation\Zend2($i18nPaths, 'gettext', $langid, array('disableNotices' => true)); |
|
| 53 | 53 | |
| 54 | - $apc = (bool) $this->container->getParameter( 'aimeos_shop.apc_enable' ); |
|
| 55 | - $prefix = $this->container->getParameter( 'aimeos_shop.apc_prefix' ); |
|
| 54 | + $apc = (bool) $this->container->getParameter('aimeos_shop.apc_enable'); |
|
| 55 | + $prefix = $this->container->getParameter('aimeos_shop.apc_prefix'); |
|
| 56 | 56 | |
| 57 | - if( function_exists( 'apc_store' ) === true && $apc === true ) { |
|
| 58 | - $i18n = new \Aimeos\MW\Translation\Decorator\APC( $i18n, $prefix ); |
|
| 57 | + if (function_exists('apc_store') === true && $apc === true) { |
|
| 58 | + $i18n = new \Aimeos\MW\Translation\Decorator\APC($i18n, $prefix); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | - $translations = $this->container->getParameter( 'aimeos_shop.i18n' ); |
|
| 61 | + $translations = $this->container->getParameter('aimeos_shop.i18n'); |
|
| 62 | 62 | |
| 63 | - if( isset( $translations[$langid] ) ) { |
|
| 64 | - $i18n = new \Aimeos\MW\Translation\Decorator\Memory( $i18n, $translations[$langid] ); |
|
| 63 | + if (isset($translations[$langid])) { |
|
| 64 | + $i18n = new \Aimeos\MW\Translation\Decorator\Memory($i18n, $translations[$langid]); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | $this->i18n[$langid] = $i18n; |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | * @param RequestStack $requestStack Current request stack |
| 32 | 32 | * @param Container $container Container object to access parameters |
| 33 | 33 | */ |
| 34 | - public function __construct( RequestStack $requestStack, Container $container ) |
|
| 34 | + public function __construct(RequestStack $requestStack, Container $container) |
|
| 35 | 35 | { |
| 36 | 36 | $this->requestStack = $requestStack; |
| 37 | 37 | $this->container = $container; |
@@ -46,53 +46,53 @@ discard block |
||
| 46 | 46 | * @param string|null $locale Code of the current language or null for no translation |
| 47 | 47 | * @return \Aimeos\MW\View\Iface View object |
| 48 | 48 | */ |
| 49 | - public function create( \Aimeos\MW\Config\Iface $config, array $templatePaths, $locale = null ) |
|
| 49 | + public function create(\Aimeos\MW\Config\Iface $config, array $templatePaths, $locale = null) |
|
| 50 | 50 | { |
| 51 | 51 | $params = $fixed = array(); |
| 52 | 52 | $request = $this->requestStack->getMasterRequest(); |
| 53 | 53 | |
| 54 | - if( $locale !== null ) |
|
| 54 | + if ($locale !== null) |
|
| 55 | 55 | { |
| 56 | - $params = $request->request->all() + $request->query->all() + $request->attributes->get( '_route_params' ); |
|
| 56 | + $params = $request->request->all() + $request->query->all() + $request->attributes->get('_route_params'); |
|
| 57 | 57 | $fixed = $this->getFixedParams(); |
| 58 | 58 | |
| 59 | - $i18n = $this->container->get('aimeos_i18n')->get( array( $locale ) ); |
|
| 59 | + $i18n = $this->container->get('aimeos_i18n')->get(array($locale)); |
|
| 60 | 60 | $translation = $i18n[$locale]; |
| 61 | 61 | } |
| 62 | 62 | else |
| 63 | 63 | { |
| 64 | - $translation = new \Aimeos\MW\Translation\None( 'en' ); |
|
| 64 | + $translation = new \Aimeos\MW\Translation\None('en'); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | |
| 68 | - $view = new \Aimeos\MW\View\Standard( $templatePaths ); |
|
| 68 | + $view = new \Aimeos\MW\View\Standard($templatePaths); |
|
| 69 | 69 | |
| 70 | - $helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation ); |
|
| 71 | - $view->addHelper( 'translate', $helper ); |
|
| 70 | + $helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation); |
|
| 71 | + $view->addHelper('translate', $helper); |
|
| 72 | 72 | |
| 73 | - $helper = new \Aimeos\MW\View\Helper\Url\Symfony2( $view, $this->container->get( 'router' ), $fixed ); |
|
| 74 | - $view->addHelper( 'url', $helper ); |
|
| 73 | + $helper = new \Aimeos\MW\View\Helper\Url\Symfony2($view, $this->container->get('router'), $fixed); |
|
| 74 | + $view->addHelper('url', $helper); |
|
| 75 | 75 | |
| 76 | - $helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params ); |
|
| 77 | - $view->addHelper( 'param', $helper ); |
|
| 76 | + $helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params); |
|
| 77 | + $view->addHelper('param', $helper); |
|
| 78 | 78 | |
| 79 | - $helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config ); |
|
| 80 | - $view->addHelper( 'config', $helper ); |
|
| 79 | + $helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config); |
|
| 80 | + $view->addHelper('config', $helper); |
|
| 81 | 81 | |
| 82 | - $sepDec = $config->get( 'client/html/common/format/seperatorDecimal', '.' ); |
|
| 83 | - $sep1000 = $config->get( 'client/html/common/format/seperator1000', ' ' ); |
|
| 84 | - $helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000 ); |
|
| 85 | - $view->addHelper( 'number', $helper ); |
|
| 82 | + $sepDec = $config->get('client/html/common/format/seperatorDecimal', '.'); |
|
| 83 | + $sep1000 = $config->get('client/html/common/format/seperator1000', ' '); |
|
| 84 | + $helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000); |
|
| 85 | + $view->addHelper('number', $helper); |
|
| 86 | 86 | |
| 87 | - if( $request !== null ) |
|
| 87 | + if ($request !== null) |
|
| 88 | 88 | { |
| 89 | - $helper = new \Aimeos\MW\View\Helper\Request\Symfony2( $view, $request ); |
|
| 90 | - $view->addHelper( 'request', $helper ); |
|
| 89 | + $helper = new \Aimeos\MW\View\Helper\Request\Symfony2($view, $request); |
|
| 90 | + $view->addHelper('request', $helper); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | - $token = $this->container->get( 'security.csrf.token_manager' )->getToken( '_token' ); |
|
| 94 | - $helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', $token->getValue() ); |
|
| 95 | - $view->addHelper( 'csrf', $helper ); |
|
| 93 | + $token = $this->container->get('security.csrf.token_manager')->getToken('_token'); |
|
| 94 | + $helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', $token->getValue()); |
|
| 95 | + $view->addHelper('csrf', $helper); |
|
| 96 | 96 | |
| 97 | 97 | return $view; |
| 98 | 98 | } |
@@ -108,15 +108,15 @@ discard block |
||
| 108 | 108 | $urlparams = array(); |
| 109 | 109 | $attr = $this->requestStack->getMasterRequest()->attributes; |
| 110 | 110 | |
| 111 | - if( ( $site = $attr->get( 'site' ) ) !== null ) { |
|
| 111 | + if (($site = $attr->get('site')) !== null) { |
|
| 112 | 112 | $urlparams['site'] = $site; |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | - if( ( $lang = $attr->get( 'locale' ) ) !== null ) { |
|
| 115 | + if (($lang = $attr->get('locale')) !== null) { |
|
| 116 | 116 | $urlparams['locale'] = $lang; |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | - if( ( $currency = $attr->get( 'currency' ) ) !== null ) { |
|
| 119 | + if (($currency = $attr->get('currency')) !== null) { |
|
| 120 | 120 | $urlparams['currency'] = $currency; |
| 121 | 121 | } |
| 122 | 122 | |
@@ -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 | } |