@@ -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\Gettext( $i18nPaths, $langid ); |
|
| 52 | + $i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $langid); |
|
| 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( 'apcu_store' ) === true && $apc === true ) { |
|
| 58 | - $i18n = new \Aimeos\MW\Translation\Decorator\APC( $i18n, $prefix ); |
|
| 57 | + if (function_exists('apcu_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; |
@@ -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,33 +40,33 @@ discard block |
||
| 40 | 40 | * @param string $type Configuration type ("frontend" or "backend") |
| 41 | 41 | * @return \Aimeos\MW\Config\Iface Config object |
| 42 | 42 | */ |
| 43 | - public function get( $type = 'frontend' ) |
|
| 43 | + public function get($type = 'frontend') |
|
| 44 | 44 | { |
| 45 | 45 | $configPaths = $this->container->get('aimeos')->get()->getConfigPaths(); |
| 46 | 46 | |
| 47 | - $conf = new \Aimeos\MW\Config\PHPArray( array(), $configPaths ); |
|
| 47 | + $conf = new \Aimeos\MW\Config\PHPArray(array(), $configPaths); |
|
| 48 | 48 | |
| 49 | - $apc = (bool) $this->container->getParameter( 'aimeos_shop.apc_enable' ); |
|
| 50 | - $prefix = $this->container->getParameter( 'aimeos_shop.apc_prefix' ); |
|
| 49 | + $apc = (bool) $this->container->getParameter('aimeos_shop.apc_enable'); |
|
| 50 | + $prefix = $this->container->getParameter('aimeos_shop.apc_prefix'); |
|
| 51 | 51 | |
| 52 | - if( function_exists( 'apcu_store' ) === true && $apc === true ) { |
|
| 53 | - $conf = new \Aimeos\MW\Config\Decorator\APC( $conf, $prefix ); |
|
| 52 | + if (function_exists('apcu_store') === true && $apc === true) { |
|
| 53 | + $conf = new \Aimeos\MW\Config\Decorator\APC($conf, $prefix); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | $local = array( |
| 57 | - 'admin' => $this->container->getParameter( 'aimeos_shop.admin' ), |
|
| 58 | - 'client' => $this->container->getParameter( 'aimeos_shop.client' ), |
|
| 59 | - 'controller' => $this->container->getParameter( 'aimeos_shop.controller' ), |
|
| 60 | - 'madmin' => $this->container->getParameter( 'aimeos_shop.madmin' ), |
|
| 61 | - 'mshop' => $this->container->getParameter( 'aimeos_shop.mshop' ), |
|
| 62 | - 'resource' => $this->container->getParameter( 'aimeos_shop.resource' ), |
|
| 57 | + 'admin' => $this->container->getParameter('aimeos_shop.admin'), |
|
| 58 | + 'client' => $this->container->getParameter('aimeos_shop.client'), |
|
| 59 | + 'controller' => $this->container->getParameter('aimeos_shop.controller'), |
|
| 60 | + 'madmin' => $this->container->getParameter('aimeos_shop.madmin'), |
|
| 61 | + 'mshop' => $this->container->getParameter('aimeos_shop.mshop'), |
|
| 62 | + 'resource' => $this->container->getParameter('aimeos_shop.resource'), |
|
| 63 | 63 | ); |
| 64 | 64 | |
| 65 | - $config = new \Aimeos\MW\Config\Decorator\Memory( $conf, $local ); |
|
| 66 | - $settings = $this->container->getParameter( 'aimeos_shop.' . $type ); |
|
| 65 | + $config = new \Aimeos\MW\Config\Decorator\Memory($conf, $local); |
|
| 66 | + $settings = $this->container->getParameter('aimeos_shop.'.$type); |
|
| 67 | 67 | |
| 68 | - if( $settings !== array() ) { |
|
| 69 | - $config = new \Aimeos\MW\Config\Decorator\Memory( $config, $settings ); |
|
| 68 | + if ($settings !== array()) { |
|
| 69 | + $config = new \Aimeos\MW\Config\Decorator\Memory($config, $settings); |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | return $config; |
@@ -31,9 +31,9 @@ discard block |
||
| 31 | 31 | * @param string Related resource location, e.g. "address" |
| 32 | 32 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
| 33 | 33 | */ |
| 34 | - public function deleteAction( ServerRequestInterface $request, $resource, $related = '' ) |
|
| 34 | + public function deleteAction(ServerRequestInterface $request, $resource, $related = '') |
|
| 35 | 35 | { |
| 36 | - return $this->createClient( $resource, $related )->delete( $request, new Response() ); |
|
| 36 | + return $this->createClient($resource, $related)->delete($request, new Response()); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | |
@@ -45,9 +45,9 @@ discard block |
||
| 45 | 45 | * @param string Related resource location, e.g. "address" |
| 46 | 46 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
| 47 | 47 | */ |
| 48 | - public function getAction( ServerRequestInterface $request, $resource, $related = '' ) |
|
| 48 | + public function getAction(ServerRequestInterface $request, $resource, $related = '') |
|
| 49 | 49 | { |
| 50 | - return $this->createClient( $resource, $related )->get( $request, new Response() ); |
|
| 50 | + return $this->createClient($resource, $related)->get($request, new Response()); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | |
@@ -59,9 +59,9 @@ discard block |
||
| 59 | 59 | * @param string Related resource location, e.g. "address" |
| 60 | 60 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
| 61 | 61 | */ |
| 62 | - public function patchAction( ServerRequestInterface $request, $resource, $related = '' ) |
|
| 62 | + public function patchAction(ServerRequestInterface $request, $resource, $related = '') |
|
| 63 | 63 | { |
| 64 | - return $this->createClient( $resource, $related )->patch( $request, new Response() ); |
|
| 64 | + return $this->createClient($resource, $related)->patch($request, new Response()); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | |
@@ -73,9 +73,9 @@ discard block |
||
| 73 | 73 | * @param string Related resource location, e.g. "address" |
| 74 | 74 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
| 75 | 75 | */ |
| 76 | - public function postAction( ServerRequestInterface $request, $resource, $related = '' ) |
|
| 76 | + public function postAction(ServerRequestInterface $request, $resource, $related = '') |
|
| 77 | 77 | { |
| 78 | - return $this->createClient( $resource, $related )->post( $request, new Response() ); |
|
| 78 | + return $this->createClient($resource, $related)->post($request, new Response()); |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | |
@@ -87,9 +87,9 @@ discard block |
||
| 87 | 87 | * @param string Related resource location, e.g. "address" |
| 88 | 88 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
| 89 | 89 | */ |
| 90 | - public function putAction( ServerRequestInterface $request, $resource, $related = '' ) |
|
| 90 | + public function putAction(ServerRequestInterface $request, $resource, $related = '') |
|
| 91 | 91 | { |
| 92 | - return $this->createClient( $resource, $related )->put( $request, new Response() ); |
|
| 92 | + return $this->createClient($resource, $related)->put($request, new Response()); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | |
@@ -100,9 +100,9 @@ discard block |
||
| 100 | 100 | * @param string Resource location, e.g. "customer" |
| 101 | 101 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
| 102 | 102 | */ |
| 103 | - public function optionsAction( ServerRequestInterface $request, $resource = '' ) |
|
| 103 | + public function optionsAction(ServerRequestInterface $request, $resource = '') |
|
| 104 | 104 | { |
| 105 | - return $this->createClient( $resource )->options( $request, new Response() ); |
|
| 105 | + return $this->createClient($resource)->options($request, new Response()); |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | |
@@ -113,15 +113,15 @@ discard block |
||
| 113 | 113 | * @param string Related resource location, e.g. "address" |
| 114 | 114 | * @return \Aimeos\Client\JsonApi\Iface JSON API client |
| 115 | 115 | */ |
| 116 | - protected function createClient( $resource, $related = '' ) |
|
| 116 | + protected function createClient($resource, $related = '') |
|
| 117 | 117 | { |
| 118 | - $tmplPaths = $this->container->get( 'aimeos' )->get()->getCustomPaths( 'client/jsonapi/templates' ); |
|
| 119 | - $context = $this->container->get( 'aimeos_context' )->get(); |
|
| 118 | + $tmplPaths = $this->container->get('aimeos')->get()->getCustomPaths('client/jsonapi/templates'); |
|
| 119 | + $context = $this->container->get('aimeos_context')->get(); |
|
| 120 | 120 | $langid = $context->getLocale()->getLanguageId(); |
| 121 | 121 | |
| 122 | - $view = $this->container->get( 'aimeos_view' )->create( $context, $tmplPaths, $langid ); |
|
| 123 | - $context->setView( $view ); |
|
| 122 | + $view = $this->container->get('aimeos_view')->create($context, $tmplPaths, $langid); |
|
| 123 | + $context->setView($view); |
|
| 124 | 124 | |
| 125 | - return \Aimeos\Client\JsonApi\Factory::createClient( $context, $tmplPaths, $resource . '/' . $related ); |
|
| 125 | + return \Aimeos\Client\JsonApi\Factory::createClient($context, $tmplPaths, $resource.'/'.$related); |
|
| 126 | 126 | } |
| 127 | 127 | } |
@@ -28,18 +28,18 @@ discard block |
||
| 28 | 28 | * @param Event $event Event instance |
| 29 | 29 | * @throws \RuntimeException If an error occured |
| 30 | 30 | */ |
| 31 | - public static function setupDatabase( Event $event ) |
|
| 31 | + public static function setupDatabase(Event $event) |
|
| 32 | 32 | { |
| 33 | 33 | $options = $env = array(); |
| 34 | 34 | |
| 35 | - if( $event->isDevMode() ) { |
|
| 35 | + if ($event->isDevMode()) { |
|
| 36 | 36 | $options[] = '--option=setup/default/demo:1'; |
| 37 | 37 | } else { |
| 38 | 38 | $env[] = '--env=prod'; |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | - self::executeCommand( $event, 'aimeos:setup', $options + $env ); |
|
| 42 | - self::executeCommand( $event, 'aimeos:cache', $env ); |
|
| 41 | + self::executeCommand($event, 'aimeos:setup', $options + $env); |
|
| 42 | + self::executeCommand($event, 'aimeos:cache', $env); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | |
@@ -49,20 +49,20 @@ discard block |
||
| 49 | 49 | * @param Event $event Event instance |
| 50 | 50 | * @throws \RuntimeException If an error occured |
| 51 | 51 | */ |
| 52 | - public static function updateConfig( Event $event ) |
|
| 52 | + public static function updateConfig(Event $event) |
|
| 53 | 53 | { |
| 54 | - $event->getIO()->write( 'Ensure existing config and routing for the shop bundle' ); |
|
| 54 | + $event->getIO()->write('Ensure existing config and routing for the shop bundle'); |
|
| 55 | 55 | |
| 56 | - $options = self::getOptions( $event ); |
|
| 56 | + $options = self::getOptions($event); |
|
| 57 | 57 | |
| 58 | - if( !isset( $options['symfony-app-dir'] ) || !is_dir( $options['symfony-app-dir'] ) ) |
|
| 58 | + if (!isset($options['symfony-app-dir']) || !is_dir($options['symfony-app-dir'])) |
|
| 59 | 59 | { |
| 60 | 60 | $msg = 'An error occurred because the "%1$s" option or the "%2$s" directory isn\'t available'; |
| 61 | - throw new \RuntimeException( sprintf( $msg, 'symfony-app-dir', $options['symfony-app-dir'] ) ); |
|
| 61 | + throw new \RuntimeException(sprintf($msg, 'symfony-app-dir', $options['symfony-app-dir'])); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - self::updateConfigFile( $options['symfony-app-dir'] . '/config/config.yml' ); |
|
| 65 | - self::updateRoutingFile( $options['symfony-app-dir'] . '/config/routing.yml' ); |
|
| 64 | + self::updateConfigFile($options['symfony-app-dir'].'/config/config.yml'); |
|
| 65 | + self::updateRoutingFile($options['symfony-app-dir'].'/config/routing.yml'); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | |
@@ -72,28 +72,28 @@ discard block |
||
| 72 | 72 | * @param Event $event Event instance |
| 73 | 73 | * @throws \RuntimeException If an error occured |
| 74 | 74 | */ |
| 75 | - public static function installBundle( Event $event ) |
|
| 75 | + public static function installBundle(Event $event) |
|
| 76 | 76 | { |
| 77 | - $event->getIO()->write( 'Installing the Aimeos shop bundle' ); |
|
| 77 | + $event->getIO()->write('Installing the Aimeos shop bundle'); |
|
| 78 | 78 | |
| 79 | - $options = self::getOptions( $event ); |
|
| 79 | + $options = self::getOptions($event); |
|
| 80 | 80 | |
| 81 | - if( !isset( $options['symfony-app-dir'] ) || !is_dir( $options['symfony-app-dir'] ) ) |
|
| 81 | + if (!isset($options['symfony-app-dir']) || !is_dir($options['symfony-app-dir'])) |
|
| 82 | 82 | { |
| 83 | 83 | $msg = 'An error occurred because the "%1$s" option or the "%2$s" directory isn\'t available'; |
| 84 | - throw new \RuntimeException( sprintf( $msg, 'symfony-app-dir', $options['symfony-app-dir'] ) ); |
|
| 84 | + throw new \RuntimeException(sprintf($msg, 'symfony-app-dir', $options['symfony-app-dir'])); |
|
| 85 | 85 | } |
| 86 | 86 | |
| 87 | - if( !isset( $options['symfony-web-dir'] ) || !is_dir( $options['symfony-web-dir'] ) ) |
|
| 87 | + if (!isset($options['symfony-web-dir']) || !is_dir($options['symfony-web-dir'])) |
|
| 88 | 88 | { |
| 89 | 89 | $msg = 'An error occurred because the "%1$s" option or the "%2$s" directory isn\'t available'; |
| 90 | - throw new \RuntimeException( sprintf( $msg, 'symfony-web-dir', $options['symfony-web-dir'] ) ); |
|
| 90 | + throw new \RuntimeException(sprintf($msg, 'symfony-web-dir', $options['symfony-web-dir'])); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | - self::createDirectory( $options['symfony-app-dir'] . '/secure' ); |
|
| 94 | - self::createDirectory( $options['symfony-web-dir'] . '/uploads' ); |
|
| 95 | - self::createDirectory( $options['symfony-web-dir'] . '/preview' ); |
|
| 96 | - self::createDirectory( $options['symfony-web-dir'] . '/files' ); |
|
| 93 | + self::createDirectory($options['symfony-app-dir'].'/secure'); |
|
| 94 | + self::createDirectory($options['symfony-web-dir'].'/uploads'); |
|
| 95 | + self::createDirectory($options['symfony-web-dir'].'/preview'); |
|
| 96 | + self::createDirectory($options['symfony-web-dir'].'/files'); |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | |
@@ -103,14 +103,14 @@ discard block |
||
| 103 | 103 | * @param string $dir Absolute path of the new directory |
| 104 | 104 | * @throws \RuntimeException If directory couldn't be created |
| 105 | 105 | */ |
| 106 | - protected static function createDirectory( $dir ) |
|
| 106 | + protected static function createDirectory($dir) |
|
| 107 | 107 | { |
| 108 | 108 | $perm = 0755; |
| 109 | 109 | |
| 110 | - if( !is_dir( $dir ) && !mkdir( $dir, $perm, true ) ) |
|
| 110 | + if (!is_dir($dir) && !mkdir($dir, $perm, true)) |
|
| 111 | 111 | { |
| 112 | 112 | $msg = 'Unable to create directory "%1$s" with permission "%2$s"'; |
| 113 | - throw new \RuntimeException( sprintf( $msg, $dir, $perm ) ); |
|
| 113 | + throw new \RuntimeException(sprintf($msg, $dir, $perm)); |
|
| 114 | 114 | } |
| 115 | 115 | } |
| 116 | 116 | |
@@ -123,28 +123,28 @@ discard block |
||
| 123 | 123 | * @param array List of configuration options for the given command |
| 124 | 124 | * @throws \RuntimeException If the command couldn't be executed |
| 125 | 125 | */ |
| 126 | - protected static function executeCommand( Event $event, $cmd, array $options = array() ) |
|
| 126 | + protected static function executeCommand(Event $event, $cmd, array $options = array()) |
|
| 127 | 127 | { |
| 128 | - $php = escapeshellarg( self::getPhp() ); |
|
| 129 | - $console = escapeshellarg( self::getConsoleDir( $event ) . '/console' ); |
|
| 130 | - $cmd = escapeshellarg( $cmd ); |
|
| 128 | + $php = escapeshellarg(self::getPhp()); |
|
| 129 | + $console = escapeshellarg(self::getConsoleDir($event).'/console'); |
|
| 130 | + $cmd = escapeshellarg($cmd); |
|
| 131 | 131 | |
| 132 | - foreach( $options as $key => $option ) { |
|
| 133 | - $options[$key] = escapeshellarg( $option ); |
|
| 132 | + foreach ($options as $key => $option) { |
|
| 133 | + $options[$key] = escapeshellarg($option); |
|
| 134 | 134 | } |
| 135 | 135 | |
| 136 | - if( $event->getIO()->isDecorated() ) { |
|
| 136 | + if ($event->getIO()->isDecorated()) { |
|
| 137 | 137 | $console .= ' --ansi'; |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | - $process = new Process( $php . ' ' . $console . ' ' . $cmd . ' ' . implode( ' ', $options ), null, null, null, 3600 ); |
|
| 140 | + $process = new Process($php.' '.$console.' '.$cmd.' '.implode(' ', $options), null, null, null, 3600); |
|
| 141 | 141 | |
| 142 | - $process->run( function( $type, $buffer ) use ( $event ) { |
|
| 143 | - $event->getIO()->write( $buffer, false ); |
|
| 142 | + $process->run(function($type, $buffer) use ($event) { |
|
| 143 | + $event->getIO()->write($buffer, false); |
|
| 144 | 144 | } ); |
| 145 | 145 | |
| 146 | - if( !$process->isSuccessful() ) { |
|
| 147 | - throw new \RuntimeException( sprintf( 'An error occurred when executing the "%s" command', escapeshellarg( $cmd ) ) ); |
|
| 146 | + if (!$process->isSuccessful()) { |
|
| 147 | + throw new \RuntimeException(sprintf('An error occurred when executing the "%s" command', escapeshellarg($cmd))); |
|
| 148 | 148 | } |
| 149 | 149 | } |
| 150 | 150 | |
@@ -157,19 +157,19 @@ discard block |
||
| 157 | 157 | * @return string The path to the console directory |
| 158 | 158 | * @throws \RuntimeException If console directory couldn't be found |
| 159 | 159 | */ |
| 160 | - protected static function getConsoleDir( Event $event ) |
|
| 160 | + protected static function getConsoleDir(Event $event) |
|
| 161 | 161 | { |
| 162 | - $options = self::getOptions( $event ); |
|
| 162 | + $options = self::getOptions($event); |
|
| 163 | 163 | |
| 164 | - if( isset( $options['symfony-bin-dir'] ) && is_dir( $options['symfony-bin-dir'] ) ) { |
|
| 164 | + if (isset($options['symfony-bin-dir']) && is_dir($options['symfony-bin-dir'])) { |
|
| 165 | 165 | return $options['symfony-bin-dir']; |
| 166 | 166 | } |
| 167 | 167 | |
| 168 | - if( isset( $options['symfony-app-dir'] ) && is_dir( $options['symfony-app-dir'] ) ) { |
|
| 168 | + if (isset($options['symfony-app-dir']) && is_dir($options['symfony-app-dir'])) { |
|
| 169 | 169 | return $options['symfony-app-dir']; |
| 170 | 170 | } |
| 171 | 171 | |
| 172 | - throw new \RuntimeException( sprintf( 'Console directory not found. Neither %1$s nor %2$s option exist', 'symfony-app-dir', 'symfony-bin-dir' ) ); |
|
| 172 | + throw new \RuntimeException(sprintf('Console directory not found. Neither %1$s nor %2$s option exist', 'symfony-app-dir', 'symfony-bin-dir')); |
|
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | * @param Event $event Command event object |
| 180 | 180 | * @return array Associative list of option keys and values |
| 181 | 181 | */ |
| 182 | - protected static function getOptions( Event $event ) |
|
| 182 | + protected static function getOptions(Event $event) |
|
| 183 | 183 | { |
| 184 | 184 | return $event->getComposer()->getPackage()->getExtra(); |
| 185 | 185 | } |
@@ -195,8 +195,8 @@ discard block |
||
| 195 | 195 | { |
| 196 | 196 | $phpFinder = new PhpExecutableFinder; |
| 197 | 197 | |
| 198 | - if( !( $phpPath = $phpFinder->find() ) ) { |
|
| 199 | - throw new \RuntimeException( 'The php executable could not be found, add it to your PATH environment variable and try again' ); |
|
| 198 | + if (!($phpPath = $phpFinder->find())) { |
|
| 199 | + throw new \RuntimeException('The php executable could not be found, add it to your PATH environment variable and try again'); |
|
| 200 | 200 | } |
| 201 | 201 | |
| 202 | 202 | return $phpPath; |
@@ -209,15 +209,15 @@ discard block |
||
| 209 | 209 | * @param string $filename Name of the YAML config file |
| 210 | 210 | * @throws \RuntimeException If file is not found |
| 211 | 211 | */ |
| 212 | - protected static function updateConfigFile( $filename ) |
|
| 212 | + protected static function updateConfigFile($filename) |
|
| 213 | 213 | { |
| 214 | - if( ( $content = file_get_contents( $filename ) ) === false ) { |
|
| 215 | - throw new \RuntimeException( sprintf( 'File "%1$s" not found', $filename ) ); |
|
| 214 | + if (($content = file_get_contents($filename)) === false) { |
|
| 215 | + throw new \RuntimeException(sprintf('File "%1$s" not found', $filename)); |
|
| 216 | 216 | } |
| 217 | 217 | |
| 218 | - if( self::addAsseticBundle( $content ) === true ) { |
|
| 218 | + if (self::addAsseticBundle($content) === true) { |
|
| 219 | 219 | $fs = new Filesystem(); |
| 220 | - $fs->dumpFile( $filename, $content ); |
|
| 220 | + $fs->dumpFile($filename, $content); |
|
| 221 | 221 | } |
| 222 | 222 | } |
| 223 | 223 | |
@@ -228,56 +228,56 @@ discard block |
||
| 228 | 228 | * @param string $filename Name of the YAML config file |
| 229 | 229 | * @throws \RuntimeException If file is not found |
| 230 | 230 | */ |
| 231 | - protected static function updateRoutingFile( $filename ) |
|
| 231 | + protected static function updateRoutingFile($filename) |
|
| 232 | 232 | { |
| 233 | - if( ( $content = file_get_contents( $filename ) ) === false ) { |
|
| 234 | - throw new \RuntimeException( sprintf( 'File "%1$s" not found', $filename ) ); |
|
| 233 | + if (($content = file_get_contents($filename)) === false) { |
|
| 234 | + throw new \RuntimeException(sprintf('File "%1$s" not found', $filename)); |
|
| 235 | 235 | } |
| 236 | 236 | |
| 237 | - if( strpos( $content, 'aimeos_shop:' ) === false ) |
|
| 237 | + if (strpos($content, 'aimeos_shop:') === false) |
|
| 238 | 238 | { |
| 239 | - $content .= "\n" . 'aimeos_shop: |
|
| 239 | + $content .= "\n".'aimeos_shop: |
|
| 240 | 240 | resource: "@AimeosShopBundle/Resources/config/routing.yml" |
| 241 | 241 | prefix: /'; |
| 242 | 242 | } |
| 243 | 243 | |
| 244 | - if( strpos( $content, 'aimeos_shop_adm:' ) === false ) |
|
| 244 | + if (strpos($content, 'aimeos_shop_adm:') === false) |
|
| 245 | 245 | { |
| 246 | - $content .= "\n" . 'aimeos_shop_adm: |
|
| 246 | + $content .= "\n".'aimeos_shop_adm: |
|
| 247 | 247 | resource: "@AimeosShopBundle/Resources/config/routing_adm.yml" |
| 248 | 248 | prefix: /'; |
| 249 | 249 | } |
| 250 | 250 | |
| 251 | - if( strpos( $content, 'aimeos_shop_extadm:' ) === false ) |
|
| 251 | + if (strpos($content, 'aimeos_shop_extadm:') === false) |
|
| 252 | 252 | { |
| 253 | - $content .= "\n" . 'aimeos_shop_extadm: |
|
| 253 | + $content .= "\n".'aimeos_shop_extadm: |
|
| 254 | 254 | resource: "@AimeosShopBundle/Resources/config/routing_extadm.yml" |
| 255 | 255 | prefix: /admin/{site}/extadm'; |
| 256 | 256 | } |
| 257 | 257 | |
| 258 | - if( strpos( $content, 'aimeos_shop_jqadm:' ) === false ) |
|
| 258 | + if (strpos($content, 'aimeos_shop_jqadm:') === false) |
|
| 259 | 259 | { |
| 260 | - $content .= "\n" . 'aimeos_shop_jqadm: |
|
| 260 | + $content .= "\n".'aimeos_shop_jqadm: |
|
| 261 | 261 | resource: "@AimeosShopBundle/Resources/config/routing_jqadm.yml" |
| 262 | 262 | prefix: /admin/{site}/jqadm'; |
| 263 | 263 | } |
| 264 | 264 | |
| 265 | - if( strpos( $content, 'aimeos_shop_jsonadm:' ) === false ) |
|
| 265 | + if (strpos($content, 'aimeos_shop_jsonadm:') === false) |
|
| 266 | 266 | { |
| 267 | - $content .= "\n" . 'aimeos_shop_jsonadm: |
|
| 267 | + $content .= "\n".'aimeos_shop_jsonadm: |
|
| 268 | 268 | resource: "@AimeosShopBundle/Resources/config/routing_jsonadm.yml" |
| 269 | 269 | prefix: /admin/{site}/jsonadm'; |
| 270 | 270 | } |
| 271 | 271 | |
| 272 | - if( strpos( $content, 'aimeos_shop_jsonapi:' ) === false ) |
|
| 272 | + if (strpos($content, 'aimeos_shop_jsonapi:') === false) |
|
| 273 | 273 | { |
| 274 | - $content .= "\n" . 'aimeos_shop_jsonapi: |
|
| 274 | + $content .= "\n".'aimeos_shop_jsonapi: |
|
| 275 | 275 | resource: "@AimeosShopBundle/Resources/config/routing_jsonapi.yml" |
| 276 | 276 | prefix: /jsonapi'; |
| 277 | 277 | } |
| 278 | 278 | |
| 279 | 279 | $fs = new Filesystem(); |
| 280 | - $fs->dumpFile( $filename, $content ); |
|
| 280 | + $fs->dumpFile($filename, $content); |
|
| 281 | 281 | } |
| 282 | 282 | |
| 283 | 283 | |
@@ -287,14 +287,14 @@ discard block |
||
| 287 | 287 | * @param string &$content Content of the config.yml file |
| 288 | 288 | * @return boolean True if modified, false if not |
| 289 | 289 | */ |
| 290 | - protected static function addAsseticBundle( &$content ) |
|
| 290 | + protected static function addAsseticBundle(&$content) |
|
| 291 | 291 | { |
| 292 | - if( preg_match( "/ bundles:[ ]*\[.*'AimeosShopBundle'.*\]/", $content ) !== 1 ) |
|
| 292 | + if (preg_match("/ bundles:[ ]*\[.*'AimeosShopBundle'.*\]/", $content) !== 1) |
|
| 293 | 293 | { |
| 294 | - $search = array( "/ bundles:[ ]*\[([^\]]+)\]/", "/ bundles:[ ]*\[([ ]*)\]/" ); |
|
| 295 | - $replace = array( " bundles: [$1,'AimeosShopBundle']", " bundles: ['AimeosShopBundle']" ); |
|
| 294 | + $search = array("/ bundles:[ ]*\[([^\]]+)\]/", "/ bundles:[ ]*\[([ ]*)\]/"); |
|
| 295 | + $replace = array(" bundles: [$1,'AimeosShopBundle']", " bundles: ['AimeosShopBundle']"); |
|
| 296 | 296 | |
| 297 | - if( ( $content = preg_replace( $search, $replace, $content ) ) !== null ) { |
|
| 297 | + if (($content = preg_replace($search, $replace, $content)) !== null) { |
|
| 298 | 298 | return true; |
| 299 | 299 | } |
| 300 | 300 | } |
@@ -19,138 +19,138 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | public function testGetId() |
| 21 | 21 | { |
| 22 | - $this->assertEquals( null, $this->object->getId() ); |
|
| 22 | + $this->assertEquals(null, $this->object->getId()); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | |
| 26 | 26 | public function testGetSetCompany() |
| 27 | 27 | { |
| 28 | - $this->object->setCompany( 'ABC' ); |
|
| 29 | - $this->assertEquals( 'ABC', $this->object->getCompany() ); |
|
| 28 | + $this->object->setCompany('ABC'); |
|
| 29 | + $this->assertEquals('ABC', $this->object->getCompany()); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | |
| 33 | 33 | public function testGetSetVatID() |
| 34 | 34 | { |
| 35 | - $this->object->setVatID( 'AT0000' ); |
|
| 36 | - $this->assertEquals( 'AT0000', $this->object->getVatID() ); |
|
| 35 | + $this->object->setVatID('AT0000'); |
|
| 36 | + $this->assertEquals('AT0000', $this->object->getVatID()); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | |
| 40 | 40 | public function testGetSetSalutation() |
| 41 | 41 | { |
| 42 | - $this->object->setSalutation( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN ); |
|
| 43 | - $this->assertEquals( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN, $this->object->getSalutation() ); |
|
| 42 | + $this->object->setSalutation(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN); |
|
| 43 | + $this->assertEquals(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN, $this->object->getSalutation()); |
|
| 44 | 44 | |
| 45 | - $this->object->setSalutation( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY ); |
|
| 46 | - $this->assertEquals( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY, $this->object->getSalutation() ); |
|
| 45 | + $this->object->setSalutation(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY); |
|
| 46 | + $this->assertEquals(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY, $this->object->getSalutation()); |
|
| 47 | 47 | |
| 48 | - $this->object->setSalutation( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MRS ); |
|
| 49 | - $this->assertEquals( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MRS, $this->object->getSalutation() ); |
|
| 48 | + $this->object->setSalutation(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MRS); |
|
| 49 | + $this->assertEquals(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MRS, $this->object->getSalutation()); |
|
| 50 | 50 | |
| 51 | - $this->object->setSalutation( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MISS ); |
|
| 52 | - $this->assertEquals( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MISS, $this->object->getSalutation() ); |
|
| 51 | + $this->object->setSalutation(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MISS); |
|
| 52 | + $this->assertEquals(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MISS, $this->object->getSalutation()); |
|
| 53 | 53 | |
| 54 | - $this->object->setSalutation( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR ); |
|
| 55 | - $this->assertEquals( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR, $this->object->getSalutation() ); |
|
| 54 | + $this->object->setSalutation(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR); |
|
| 55 | + $this->assertEquals(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR, $this->object->getSalutation()); |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | |
| 59 | 59 | public function testGetSetTitle() |
| 60 | 60 | { |
| 61 | - $this->object->setTitle( 'Prof. Dr.' ); |
|
| 62 | - $this->assertEquals( 'Prof. Dr.', $this->object->getTitle() ); |
|
| 61 | + $this->object->setTitle('Prof. Dr.'); |
|
| 62 | + $this->assertEquals('Prof. Dr.', $this->object->getTitle()); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | |
| 66 | 66 | public function testGetSetFirstname() |
| 67 | 67 | { |
| 68 | - $this->object->setFirstname( 'first' ); |
|
| 69 | - $this->assertEquals( 'first', $this->object->getFirstname() ); |
|
| 68 | + $this->object->setFirstname('first'); |
|
| 69 | + $this->assertEquals('first', $this->object->getFirstname()); |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | |
| 73 | 73 | public function testGetSetLastname() |
| 74 | 74 | { |
| 75 | - $this->object->setLastname( 'last' ); |
|
| 76 | - $this->assertEquals( 'last', $this->object->getLastname() ); |
|
| 75 | + $this->object->setLastname('last'); |
|
| 76 | + $this->assertEquals('last', $this->object->getLastname()); |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | |
| 80 | 80 | public function testGetSetAddress1() |
| 81 | 81 | { |
| 82 | - $this->object->setAddress1( 'test street' ); |
|
| 83 | - $this->assertEquals( 'test street', $this->object->getAddress1() ); |
|
| 82 | + $this->object->setAddress1('test street'); |
|
| 83 | + $this->assertEquals('test street', $this->object->getAddress1()); |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | |
| 87 | 87 | public function testGetSetAddress2() |
| 88 | 88 | { |
| 89 | - $this->object->setAddress2( '1' ); |
|
| 90 | - $this->assertEquals( '1', $this->object->getAddress2() ); |
|
| 89 | + $this->object->setAddress2('1'); |
|
| 90 | + $this->assertEquals('1', $this->object->getAddress2()); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | |
| 94 | 94 | public function testGetSetAddress3() |
| 95 | 95 | { |
| 96 | - $this->object->setAddress3( 'EG' ); |
|
| 97 | - $this->assertEquals( 'EG', $this->object->getAddress3() ); |
|
| 96 | + $this->object->setAddress3('EG'); |
|
| 97 | + $this->assertEquals('EG', $this->object->getAddress3()); |
|
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | |
| 101 | 101 | public function testGetSetPostal() |
| 102 | 102 | { |
| 103 | - $this->object->setPostal( '12345' ); |
|
| 104 | - $this->assertEquals( '12345', $this->object->getPostal() ); |
|
| 103 | + $this->object->setPostal('12345'); |
|
| 104 | + $this->assertEquals('12345', $this->object->getPostal()); |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | |
| 108 | 108 | public function testGetSetCity() |
| 109 | 109 | { |
| 110 | - $this->object->setCity( 'Munich' ); |
|
| 111 | - $this->assertEquals( 'Munich', $this->object->getCity() ); |
|
| 110 | + $this->object->setCity('Munich'); |
|
| 111 | + $this->assertEquals('Munich', $this->object->getCity()); |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | |
| 115 | 115 | public function testGetSetState() |
| 116 | 116 | { |
| 117 | - $this->object->setState( 'Bayern' ); |
|
| 118 | - $this->assertEquals( 'Bayern', $this->object->getState() ); |
|
| 117 | + $this->object->setState('Bayern'); |
|
| 118 | + $this->assertEquals('Bayern', $this->object->getState()); |
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | |
| 122 | 122 | public function testGetSetCountryId() |
| 123 | 123 | { |
| 124 | - $this->object->setCountryId( 'DE' ); |
|
| 125 | - $this->assertEquals( 'DE', $this->object->getCountryId() ); |
|
| 124 | + $this->object->setCountryId('DE'); |
|
| 125 | + $this->assertEquals('DE', $this->object->getCountryId()); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | |
| 129 | 129 | public function testGetSetLanguageId() |
| 130 | 130 | { |
| 131 | - $this->object->setLanguageId( 'de' ); |
|
| 132 | - $this->assertEquals( 'de', $this->object->getLanguageId() ); |
|
| 131 | + $this->object->setLanguageId('de'); |
|
| 132 | + $this->assertEquals('de', $this->object->getLanguageId()); |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | |
| 136 | 136 | public function testGetSetTelephone() |
| 137 | 137 | { |
| 138 | - $this->object->setTelephone( '089123456789' ); |
|
| 139 | - $this->assertEquals( '089123456789', $this->object->getTelephone() ); |
|
| 138 | + $this->object->setTelephone('089123456789'); |
|
| 139 | + $this->assertEquals('089123456789', $this->object->getTelephone()); |
|
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | |
| 143 | 143 | public function testGetSetTelefax() |
| 144 | 144 | { |
| 145 | - $this->object->setTelefax( '089987654321' ); |
|
| 146 | - $this->assertEquals( '089987654321', $this->object->getTelefax() ); |
|
| 145 | + $this->object->setTelefax('089987654321'); |
|
| 146 | + $this->assertEquals('089987654321', $this->object->getTelefax()); |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | |
| 150 | 150 | public function testGetSetWebsite() |
| 151 | 151 | { |
| 152 | - $this->object->setWebsite( 'http://aimeos.org' ); |
|
| 153 | - $this->assertEquals( 'http://aimeos.org', $this->object->getWebsite() ); |
|
| 152 | + $this->object->setWebsite('http://aimeos.org'); |
|
| 153 | + $this->assertEquals('http://aimeos.org', $this->object->getWebsite()); |
|
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | |
@@ -159,6 +159,6 @@ discard block |
||
| 159 | 159 | */ |
| 160 | 160 | public function testSetWebsiteInvalid() |
| 161 | 161 | { |
| 162 | - $this->object->setWebsite( 'aimeos+org' ); |
|
| 162 | + $this->object->setWebsite('aimeos+org'); |
|
| 163 | 163 | } |
| 164 | 164 | } |
@@ -19,50 +19,50 @@ |
||
| 19 | 19 | |
| 20 | 20 | public function testGetId() |
| 21 | 21 | { |
| 22 | - $this->assertEquals( null, $this->object->getId() ); |
|
| 22 | + $this->assertEquals(null, $this->object->getId()); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | |
| 26 | 26 | public function testGetUsername() |
| 27 | 27 | { |
| 28 | - $this->assertEquals( null, $this->object->getUsername() ); |
|
| 28 | + $this->assertEquals(null, $this->object->getUsername()); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | |
| 32 | 32 | public function testGetPassword() |
| 33 | 33 | { |
| 34 | - $this->assertEquals( null, $this->object->getPassword() ); |
|
| 34 | + $this->assertEquals(null, $this->object->getPassword()); |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | |
| 38 | 38 | public function testGetSalt() |
| 39 | 39 | { |
| 40 | - $this->assertEquals( 'mshop', $this->object->getSalt() ); |
|
| 40 | + $this->assertEquals('mshop', $this->object->getSalt()); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | |
| 44 | 44 | public function testGetRoles() |
| 45 | 45 | { |
| 46 | - $this->assertEquals( array( 'ROLE_USER' ), $this->object->getRoles() ); |
|
| 46 | + $this->assertEquals(array('ROLE_USER'), $this->object->getRoles()); |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | |
| 50 | 50 | public function testEraseCredentials() |
| 51 | 51 | { |
| 52 | 52 | $this->object->eraseCredentials(); |
| 53 | - $this->assertNull( $this->object->getPassword() ); |
|
| 53 | + $this->assertNull($this->object->getPassword()); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | |
| 57 | 57 | public function testSerialize() |
| 58 | 58 | { |
| 59 | - $this->assertEquals( 'a:3:{i:0;N;i:1;N;i:2;N;}', $this->object->serialize() ); |
|
| 59 | + $this->assertEquals('a:3:{i:0;N;i:1;N;i:2;N;}', $this->object->serialize()); |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | |
| 63 | 63 | public function testUnserialize() |
| 64 | 64 | { |
| 65 | - $this->object->unserialize( 'a:3:{i:0;N;i:1;N;i:2;N;}' ); |
|
| 66 | - $this->assertNull( $this->object->getId() ); |
|
| 65 | + $this->object->unserialize('a:3:{i:0;N;i:1;N;i:2;N;}'); |
|
| 66 | + $this->assertNull($this->object->getId()); |
|
| 67 | 67 | } |
| 68 | 68 | } |
@@ -28,8 +28,8 @@ discard block |
||
| 28 | 28 | */ |
| 29 | 29 | public function indexAction() |
| 30 | 30 | { |
| 31 | - $params = $this->get( 'aimeos_page' )->getSections( 'basket-index' ); |
|
| 32 | - $response = $this->render( 'AimeosShopBundle:Basket:index.html.twig', $params ); |
|
| 31 | + $params = $this->get('aimeos_page')->getSections('basket-index'); |
|
| 32 | + $response = $this->render('AimeosShopBundle:Basket:index.html.twig', $params); |
|
| 33 | 33 | $response->headers->set('Cache-Control', 'no-store'); |
| 34 | 34 | return $response; |
| 35 | 35 | } |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | */ |
| 42 | 42 | public function miniComponentAction() |
| 43 | 43 | { |
| 44 | - $response = $this->getOutput( 'basket/mini' ); |
|
| 44 | + $response = $this->getOutput('basket/mini'); |
|
| 45 | 45 | $response->headers->set('Cache-Control', 'no-store'); |
| 46 | 46 | return $response; |
| 47 | 47 | } |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | */ |
| 55 | 55 | public function relatedComponentAction() |
| 56 | 56 | { |
| 57 | - $response = $this->getOutput( 'basket/related' ); |
|
| 57 | + $response = $this->getOutput('basket/related'); |
|
| 58 | 58 | $response->headers->set('Cache-Control', 'no-store'); |
| 59 | 59 | return $response; |
| 60 | 60 | } |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | */ |
| 68 | 68 | public function standardComponentAction() |
| 69 | 69 | { |
| 70 | - $response = $this->getOutput( 'basket/standard' ); |
|
| 70 | + $response = $this->getOutput('basket/standard'); |
|
| 71 | 71 | $response->headers->set('Cache-Control', 'no-store'); |
| 72 | 72 | return $response; |
| 73 | 73 | } |
@@ -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 | - $response = $this->render( 'AimeosShopBundle:Checkout:confirm.html.twig', $params ); |
|
| 31 | + $params = $this->get('aimeos_page')->getSections('checkout-confirm'); |
|
| 32 | + $response = $this->render('AimeosShopBundle:Checkout:confirm.html.twig', $params); |
|
| 33 | 33 | $response->headers->set('Cache-Control', 'no-store'); |
| 34 | 34 | return $response; |
| 35 | 35 | } |
@@ -42,8 +42,8 @@ discard block |
||
| 42 | 42 | */ |
| 43 | 43 | public function indexAction() |
| 44 | 44 | { |
| 45 | - $params = $this->get( 'aimeos_page' )->getSections( 'checkout-index' ); |
|
| 46 | - $response = $this->render( 'AimeosShopBundle:Checkout:index.html.twig', $params ); |
|
| 45 | + $params = $this->get('aimeos_page')->getSections('checkout-index'); |
|
| 46 | + $response = $this->render('AimeosShopBundle:Checkout:index.html.twig', $params); |
|
| 47 | 47 | $response->headers->set('Cache-Control', 'no-store'); |
| 48 | 48 | return $response; |
| 49 | 49 | } |
@@ -56,8 +56,8 @@ discard block |
||
| 56 | 56 | */ |
| 57 | 57 | public function updateAction() |
| 58 | 58 | { |
| 59 | - $params = $this->get( 'aimeos_page' )->getSections( 'checkout-update' ); |
|
| 60 | - $response = $this->render( 'AimeosShopBundle:Checkout:update.html.twig', $params ); |
|
| 59 | + $params = $this->get('aimeos_page')->getSections('checkout-update'); |
|
| 60 | + $response = $this->render('AimeosShopBundle:Checkout:update.html.twig', $params); |
|
| 61 | 61 | $response->headers->set('Cache-Control', 'no-store'); |
| 62 | 62 | return $response; |
| 63 | 63 | } |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | */ |
| 71 | 71 | public function confirmComponentAction() |
| 72 | 72 | { |
| 73 | - $response = $this->getOutput( 'checkout/confirm' ); |
|
| 73 | + $response = $this->getOutput('checkout/confirm'); |
|
| 74 | 74 | $response->headers->set('Cache-Control', 'no-store'); |
| 75 | 75 | return $response; |
| 76 | 76 | } |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | */ |
| 84 | 84 | public function standardComponentAction() |
| 85 | 85 | { |
| 86 | - $response = $this->getOutput( 'checkout/standard' ); |
|
| 86 | + $response = $this->getOutput('checkout/standard'); |
|
| 87 | 87 | $response->headers->set('Cache-Control', 'no-store'); |
| 88 | 88 | return $response; |
| 89 | 89 | } |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | */ |
| 97 | 97 | public function updateComponentAction() |
| 98 | 98 | { |
| 99 | - $response = $this->getOutput( 'checkout/update' ); |
|
| 99 | + $response = $this->getOutput('checkout/update'); |
|
| 100 | 100 | $response->headers->set('Cache-Control', 'no-store'); |
| 101 | 101 | return $response; |
| 102 | 102 | } |
@@ -10,14 +10,14 @@ |
||
| 10 | 10 | { |
| 11 | 11 | public function testSelectComponent() |
| 12 | 12 | { |
| 13 | - $mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\LocaleController' ) |
|
| 14 | - ->setMethods( array( 'getOutput' ) ) |
|
| 13 | + $mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\LocaleController') |
|
| 14 | + ->setMethods(array('getOutput')) |
|
| 15 | 15 | ->disableOriginalConstructor() |
| 16 | 16 | ->getMock(); |
| 17 | 17 | |
| 18 | - $response = Response::create( 'test' ); |
|
| 19 | - $mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) ); |
|
| 18 | + $response = Response::create('test'); |
|
| 19 | + $mock->expects($this->once())->method('getOutput')->will($this->returnValue($response)); |
|
| 20 | 20 | |
| 21 | - $this->assertSame( $response, $mock->selectComponentAction() ); |
|
| 21 | + $this->assertSame($response, $mock->selectComponentAction()); |
|
| 22 | 22 | } |
| 23 | 23 | } |