@@ -7,7 +7,7 @@ discard block |
||
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | 9 | |
| 10 | -if( !function_exists( 'aiconfig' ) ) |
|
| 10 | +if (!function_exists('aiconfig')) |
|
| 11 | 11 | { |
| 12 | 12 | /** |
| 13 | 13 | * Returns the configuration setting for the given key |
@@ -16,14 +16,14 @@ discard block |
||
| 16 | 16 | * @param mixed $default Default value if the configuration key isn't found |
| 17 | 17 | * @return mixed Configuration value |
| 18 | 18 | */ |
| 19 | - function aiconfig( $key, $default = null ) |
|
| 19 | + function aiconfig($key, $default = null) |
|
| 20 | 20 | { |
| 21 | - return app( '\Aimeos\Shop\Base\Config' )->get()->get( $key, $default ); |
|
| 21 | + return app('\Aimeos\Shop\Base\Config')->get()->get($key, $default); |
|
| 22 | 22 | } |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | |
| 26 | -if( !function_exists( 'aitrans' ) ) |
|
| 26 | +if (!function_exists('aitrans')) |
|
| 27 | 27 | { |
| 28 | 28 | /** |
| 29 | 29 | * Translates the given message |
@@ -34,16 +34,16 @@ discard block |
||
| 34 | 34 | * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" |
| 35 | 35 | * @return string Translated string |
| 36 | 36 | */ |
| 37 | - function aitrans( $singular, array $params = array(), $domain = 'client', $locale = null ) |
|
| 37 | + function aitrans($singular, array $params = array(), $domain = 'client', $locale = null) |
|
| 38 | 38 | { |
| 39 | - $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); |
|
| 39 | + $i18n = app('\Aimeos\Shop\Base\Context')->get()->getI18n($locale); |
|
| 40 | 40 | |
| 41 | - return vsprintf( $i18n->dt( $domain, $singular ), $params ); |
|
| 41 | + return vsprintf($i18n->dt($domain, $singular), $params); |
|
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | |
| 46 | -if( !function_exists( 'aitransplural' ) ) |
|
| 46 | +if (!function_exists('aitransplural')) |
|
| 47 | 47 | { |
| 48 | 48 | /** |
| 49 | 49 | * Translates the given messages based on the number |
@@ -56,10 +56,10 @@ discard block |
||
| 56 | 56 | * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" |
| 57 | 57 | * @return string Translated string |
| 58 | 58 | */ |
| 59 | - function aitransplural( $singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null ) |
|
| 59 | + function aitransplural($singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null) |
|
| 60 | 60 | { |
| 61 | - $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); |
|
| 61 | + $i18n = app('\Aimeos\Shop\Base\Context')->get()->getI18n($locale); |
|
| 62 | 62 | |
| 63 | - return vsprintf( $i18n->dn( $domain, $singular, $plural, $number ), $params ); |
|
| 63 | + return vsprintf($i18n->dn($domain, $singular, $plural, $number), $params); |
|
| 64 | 64 | } |
| 65 | 65 | } |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | * |
| 35 | 35 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object |
| 36 | 36 | */ |
| 37 | - public function __construct( \Illuminate\Contracts\Config\Repository $config ) |
|
| 37 | + public function __construct(\Illuminate\Contracts\Config\Repository $config) |
|
| 38 | 38 | { |
| 39 | 39 | $this->config = $config; |
| 40 | 40 | } |
@@ -47,16 +47,16 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | public function get() |
| 49 | 49 | { |
| 50 | - if( $this->object === null ) |
|
| 50 | + if ($this->object === null) |
|
| 51 | 51 | { |
| 52 | - $dir = base_path( 'ext' ); |
|
| 52 | + $dir = base_path('ext'); |
|
| 53 | 53 | |
| 54 | - if( !is_dir( $dir ) ) { |
|
| 55 | - $dir = dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . DIRECTORY_SEPARATOR . 'ext'; |
|
| 54 | + if (!is_dir($dir)) { |
|
| 55 | + $dir = dirname(dirname(dirname(dirname(__DIR__)))).DIRECTORY_SEPARATOR.'ext'; |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - $extDirs = (array) $this->config->get( 'shop.extdir', $dir ); |
|
| 59 | - $this->object = new \Aimeos\Bootstrap( $extDirs, false ); |
|
| 58 | + $extDirs = (array) $this->config->get('shop.extdir', $dir); |
|
| 59 | + $this->object = new \Aimeos\Bootstrap($extDirs, false); |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | return $this->object; |
@@ -70,12 +70,12 @@ discard block |
||
| 70 | 70 | */ |
| 71 | 71 | public function getVersion() |
| 72 | 72 | { |
| 73 | - if( ( $content = @file_get_contents( base_path( 'composer.lock' ) ) ) !== false |
|
| 74 | - && ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] ) |
|
| 73 | + if (($content = @file_get_contents(base_path('composer.lock'))) !== false |
|
| 74 | + && ($content = json_decode($content, true)) !== null && isset($content['packages']) |
|
| 75 | 75 | ) { |
| 76 | - foreach( (array) $content['packages'] as $item ) |
|
| 76 | + foreach ((array) $content['packages'] as $item) |
|
| 77 | 77 | { |
| 78 | - if( $item['name'] === 'aimeos/aimeos-laravel' ) { |
|
| 78 | + if ($item['name'] === 'aimeos/aimeos-laravel') { |
|
| 79 | 79 | return $item['version']; |
| 80 | 80 | } |
| 81 | 81 | } |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object |
| 41 | 41 | * @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object |
| 42 | 42 | */ |
| 43 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos ) |
|
| 43 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos) |
|
| 44 | 44 | { |
| 45 | 45 | $this->aimeos = $aimeos; |
| 46 | 46 | $this->config = $config; |
@@ -53,23 +53,23 @@ discard block |
||
| 53 | 53 | * @param integer $type Configuration type ("frontend" or "backend") |
| 54 | 54 | * @return \Aimeos\MW\Config\Iface Configuration object |
| 55 | 55 | */ |
| 56 | - public function get( $type = 'frontend' ) |
|
| 56 | + public function get($type = 'frontend') |
|
| 57 | 57 | { |
| 58 | - if( !isset( $this->objects[$type] ) ) |
|
| 58 | + if (!isset($this->objects[$type])) |
|
| 59 | 59 | { |
| 60 | 60 | $configPaths = $this->aimeos->get()->getConfigPaths(); |
| 61 | - $cfgfile = dirname( dirname( dirname( __DIR__ ) ) ) . DIRECTORY_SEPARATOR . 'default.php'; |
|
| 61 | + $cfgfile = dirname(dirname(dirname(__DIR__))).DIRECTORY_SEPARATOR.'default.php'; |
|
| 62 | 62 | |
| 63 | - $config = new \Aimeos\MW\Config\PHPArray( require $cfgfile, $configPaths ); |
|
| 63 | + $config = new \Aimeos\MW\Config\PHPArray(require $cfgfile, $configPaths); |
|
| 64 | 64 | |
| 65 | - if( $this->config->get( 'shop.apc_enabled', false ) == true ) { |
|
| 66 | - $config = new \Aimeos\MW\Config\Decorator\APC( $config, $this->config->get( 'shop.apc_prefix', 'laravel:' ) ); |
|
| 65 | + if ($this->config->get('shop.apc_enabled', false) == true) { |
|
| 66 | + $config = new \Aimeos\MW\Config\Decorator\APC($config, $this->config->get('shop.apc_prefix', 'laravel:')); |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - $config = new \Aimeos\MW\Config\Decorator\Memory( $config, $this->config->get( 'shop' ) ); |
|
| 69 | + $config = new \Aimeos\MW\Config\Decorator\Memory($config, $this->config->get('shop')); |
|
| 70 | 70 | |
| 71 | - if( ( $conf = $this->config->get( 'shop.' . $type, array() ) ) !== array() ) { |
|
| 72 | - $config = new \Aimeos\MW\Config\Decorator\Memory( $config, $conf ); |
|
| 71 | + if (($conf = $this->config->get('shop.'.$type, array())) !== array()) { |
|
| 72 | + $config = new \Aimeos\MW\Config\Decorator\Memory($config, $conf); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | $this->objects[$type] = $config; |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object |
| 41 | 41 | * @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object |
| 42 | 42 | */ |
| 43 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos ) |
|
| 43 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos) |
|
| 44 | 44 | { |
| 45 | 45 | $this->aimeos = $aimeos; |
| 46 | 46 | $this->config = $config; |
@@ -53,22 +53,22 @@ discard block |
||
| 53 | 53 | * @param array $languageIds List of two letter ISO language IDs |
| 54 | 54 | * @return \Aimeos\MW\Translation\Iface[] List of translation objects |
| 55 | 55 | */ |
| 56 | - public function get( array $languageIds ) |
|
| 56 | + public function get(array $languageIds) |
|
| 57 | 57 | { |
| 58 | 58 | $i18nPaths = $this->aimeos->get()->getI18nPaths(); |
| 59 | 59 | |
| 60 | - foreach( $languageIds as $langid ) |
|
| 60 | + foreach ($languageIds as $langid) |
|
| 61 | 61 | { |
| 62 | - if( !isset( $this->i18n[$langid] ) ) |
|
| 62 | + if (!isset($this->i18n[$langid])) |
|
| 63 | 63 | { |
| 64 | - $i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $langid ); |
|
| 64 | + $i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $langid); |
|
| 65 | 65 | |
| 66 | - if( $this->config->get( 'shop.apc_enabled', false ) == true ) { |
|
| 67 | - $i18n = new \Aimeos\MW\Translation\Decorator\APC( $i18n, $this->config->get( 'shop.apc_prefix', 'laravel:' ) ); |
|
| 66 | + if ($this->config->get('shop.apc_enabled', false) == true) { |
|
| 67 | + $i18n = new \Aimeos\MW\Translation\Decorator\APC($i18n, $this->config->get('shop.apc_prefix', 'laravel:')); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | - if( $this->config->has( 'shop.i18n.' . $langid ) ) { |
|
| 71 | - $i18n = new \Aimeos\MW\Translation\Decorator\Memory( $i18n, $this->config->get( 'shop.i18n.' . $langid ) ); |
|
| 70 | + if ($this->config->has('shop.i18n.'.$langid)) { |
|
| 71 | + $i18n = new \Aimeos\MW\Translation\Decorator\Memory($i18n, $this->config->get('shop.i18n.'.$langid)); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | $this->i18n[$langid] = $i18n; |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | public function indexAction() |
| 31 | 31 | { |
| 32 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'basket-index' ); |
|
| 32 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('basket-index'); |
|
| 33 | 33 | return Response::view('shop::basket.index', $params)->header('Cache-Control', 'no-store'); |
| 34 | 34 | } |
| 35 | 35 | } |
| 36 | 36 | \ No newline at end of file |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | public function confirmAction() |
| 31 | 31 | { |
| 32 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-confirm' ); |
|
| 32 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-confirm'); |
|
| 33 | 33 | return Response::view('shop::checkout.confirm', $params)->header('Cache-Control', 'no-store'); |
| 34 | 34 | } |
| 35 | 35 | |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | */ |
| 42 | 42 | public function indexAction() |
| 43 | 43 | { |
| 44 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-index' ); |
|
| 44 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-index'); |
|
| 45 | 45 | return Response::view('shop::checkout.index', $params)->header('Cache-Control', 'no-store'); |
| 46 | 46 | } |
| 47 | 47 | |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | */ |
| 54 | 54 | public function updateAction() |
| 55 | 55 | { |
| 56 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-update' ); |
|
| 56 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-update'); |
|
| 57 | 57 | return Response::view('shop::checkout.update', $params)->header('Cache-Control', 'no-store'); |
| 58 | 58 | } |
| 59 | 59 | } |
| 60 | 60 | \ No newline at end of file |
@@ -37,13 +37,13 @@ discard block |
||
| 37 | 37 | public function boot() |
| 38 | 38 | { |
| 39 | 39 | $ds = DIRECTORY_SEPARATOR; |
| 40 | - $basedir = dirname( dirname( __DIR__ ) ) . $ds; |
|
| 40 | + $basedir = dirname(dirname(__DIR__)).$ds; |
|
| 41 | 41 | |
| 42 | - $this->loadRoutesFrom( $basedir . 'routes.php' ); |
|
| 43 | - $this->loadViewsFrom( $basedir . 'views', 'shop' ); |
|
| 42 | + $this->loadRoutesFrom($basedir.'routes.php'); |
|
| 43 | + $this->loadViewsFrom($basedir.'views', 'shop'); |
|
| 44 | 44 | |
| 45 | - $this->publishes( [ $basedir . 'config/shop.php' => config_path( 'shop.php' ) ], 'config' ); |
|
| 46 | - $this->publishes( [ dirname( $basedir ) . $ds . 'public' => public_path( 'packages/aimeos/shop' ) ], 'public' ); |
|
| 45 | + $this->publishes([$basedir.'config/shop.php' => config_path('shop.php')], 'config'); |
|
| 46 | + $this->publishes([dirname($basedir).$ds.'public' => public_path('packages/aimeos/shop')], 'public'); |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | */ |
| 55 | 55 | public function register() |
| 56 | 56 | { |
| 57 | - $this->mergeConfigFrom( dirname( dirname( __DIR__ ) ) . DIRECTORY_SEPARATOR . 'default.php', 'shop'); |
|
| 57 | + $this->mergeConfigFrom(dirname(dirname(__DIR__)).DIRECTORY_SEPARATOR.'default.php', 'shop'); |
|
| 58 | 58 | |
| 59 | 59 | $this->app->singleton('Aimeos\Shop\Base\Aimeos', function($app) { |
| 60 | 60 | return new \Aimeos\Shop\Base\Aimeos($app['config']); |
@@ -89,12 +89,12 @@ discard block |
||
| 89 | 89 | }); |
| 90 | 90 | |
| 91 | 91 | |
| 92 | - $this->commands( array( |
|
| 92 | + $this->commands(array( |
|
| 93 | 93 | 'Aimeos\Shop\Command\AccountCommand', |
| 94 | 94 | 'Aimeos\Shop\Command\CacheCommand', |
| 95 | 95 | 'Aimeos\Shop\Command\SetupCommand', |
| 96 | 96 | 'Aimeos\Shop\Command\JobsCommand', |
| 97 | - ) ); |
|
| 97 | + )); |
|
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | |
@@ -49,39 +49,39 @@ discard block |
||
| 49 | 49 | */ |
| 50 | 50 | public function handle() |
| 51 | 51 | { |
| 52 | - $ctx = $this->getLaravel()->make( '\Aimeos\Shop\Base\Context' )->get( false, 'command' ); |
|
| 53 | - $ctx->setEditor( 'aimeos:setup' ); |
|
| 52 | + $ctx = $this->getLaravel()->make('\Aimeos\Shop\Base\Context')->get(false, 'command'); |
|
| 53 | + $ctx->setEditor('aimeos:setup'); |
|
| 54 | 54 | |
| 55 | 55 | $config = $ctx->getConfig(); |
| 56 | - $site = $this->argument( 'site' ); |
|
| 57 | - $template = $this->argument( 'tplsite' ); |
|
| 56 | + $site = $this->argument('site'); |
|
| 57 | + $template = $this->argument('tplsite'); |
|
| 58 | 58 | |
| 59 | - $config->set( 'setup/site', $site ); |
|
| 60 | - $dbconfig = $this->getDbConfig( $config ); |
|
| 61 | - $this->setOptions( $config ); |
|
| 59 | + $config->set('setup/site', $site); |
|
| 60 | + $dbconfig = $this->getDbConfig($config); |
|
| 61 | + $this->setOptions($config); |
|
| 62 | 62 | |
| 63 | - $taskPaths = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get()->getSetupPaths( $template ); |
|
| 64 | - $manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx ); |
|
| 63 | + $taskPaths = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get()->getSetupPaths($template); |
|
| 64 | + $manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx); |
|
| 65 | 65 | |
| 66 | - $this->info( sprintf( 'Initializing or updating the Aimeos database tables for site "%1$s"', $site ) ); |
|
| 66 | + $this->info(sprintf('Initializing or updating the Aimeos database tables for site "%1$s"', $site)); |
|
| 67 | 67 | |
| 68 | - if( ( $task = $this->option( 'task' ) ) && is_array( $task ) ) { |
|
| 69 | - $task = reset( $task ); |
|
| 68 | + if (($task = $this->option('task')) && is_array($task)) { |
|
| 69 | + $task = reset($task); |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | - switch( $this->option( 'action' ) ) |
|
| 72 | + switch ($this->option('action')) |
|
| 73 | 73 | { |
| 74 | 74 | case 'migrate': |
| 75 | - $manager->migrate( $task ); |
|
| 75 | + $manager->migrate($task); |
|
| 76 | 76 | break; |
| 77 | 77 | case 'rollback': |
| 78 | - $manager->rollback( $task ); |
|
| 78 | + $manager->rollback($task); |
|
| 79 | 79 | break; |
| 80 | 80 | case 'clean': |
| 81 | - $manager->clean( $task ); |
|
| 81 | + $manager->clean($task); |
|
| 82 | 82 | break; |
| 83 | 83 | default: |
| 84 | - throw new \Exception( sprintf( 'Invalid setup action "%1$s"', $this->option( 'action' ) ) ); |
|
| 84 | + throw new \Exception(sprintf('Invalid setup action "%1$s"', $this->option('action'))); |
|
| 85 | 85 | } |
| 86 | 86 | } |
| 87 | 87 | |
@@ -92,14 +92,14 @@ discard block |
||
| 92 | 92 | * @param \Aimeos\MW\Config\Iface $conf Config object |
| 93 | 93 | * @return array Multi-dimensional associative list of database configuration parameters |
| 94 | 94 | */ |
| 95 | - protected function getDbConfig( \Aimeos\MW\Config\Iface $conf ) |
|
| 95 | + protected function getDbConfig(\Aimeos\MW\Config\Iface $conf) |
|
| 96 | 96 | { |
| 97 | - $dbconfig = $conf->get( 'resource', array() ); |
|
| 97 | + $dbconfig = $conf->get('resource', array()); |
|
| 98 | 98 | |
| 99 | - foreach( $dbconfig as $rname => $dbconf ) |
|
| 99 | + foreach ($dbconfig as $rname => $dbconf) |
|
| 100 | 100 | { |
| 101 | - if( strncmp( $rname, 'db', 2 ) !== 0 ) { |
|
| 102 | - unset( $dbconfig[$rname] ); |
|
| 101 | + if (strncmp($rname, 'db', 2) !== 0) { |
|
| 102 | + unset($dbconfig[$rname]); |
|
| 103 | 103 | } |
| 104 | 104 | } |
| 105 | 105 | |
@@ -114,12 +114,12 @@ discard block |
||
| 114 | 114 | * @param array Associative list of database configurations |
| 115 | 115 | * @throws \RuntimeException If the format of the options is invalid |
| 116 | 116 | */ |
| 117 | - protected function setOptions( \Aimeos\MW\Config\Iface $conf ) |
|
| 117 | + protected function setOptions(\Aimeos\MW\Config\Iface $conf) |
|
| 118 | 118 | { |
| 119 | - foreach( (array) $this->option( 'option' ) as $option ) |
|
| 119 | + foreach ((array) $this->option('option') as $option) |
|
| 120 | 120 | { |
| 121 | - list( $name, $value ) = explode( ':', $option ); |
|
| 122 | - $conf->set( str_replace( '\\', '/', $name ), $value ); |
|
| 121 | + list($name, $value) = explode(':', $option); |
|
| 122 | + $conf->set(str_replace('\\', '/', $name), $value); |
|
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | 125 | } |
@@ -47,8 +47,8 @@ discard block |
||
| 47 | 47 | * @param \Aimeos\Shop\Base\I18n $i18n I18n object |
| 48 | 48 | * @param \Aimeos\Shop\Base\Support $support Support object |
| 49 | 49 | */ |
| 50 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, |
|
| 51 | - \Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support ) |
|
| 50 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, |
|
| 51 | + \Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support) |
|
| 52 | 52 | { |
| 53 | 53 | $this->i18n = $i18n; |
| 54 | 54 | $this->config = $config; |
@@ -64,24 +64,24 @@ discard block |
||
| 64 | 64 | * @param string|null $locale Code of the current language or null for no translation |
| 65 | 65 | * @return \Aimeos\MW\View\Iface View object |
| 66 | 66 | */ |
| 67 | - public function create( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null ) |
|
| 67 | + public function create(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null) |
|
| 68 | 68 | { |
| 69 | - $engine = new \Aimeos\MW\View\Engine\Blade( app( 'Illuminate\Contracts\View\Factory' ) ); |
|
| 70 | - $view = new \Aimeos\MW\View\Standard( $templatePaths, array( '.blade.php' => $engine ) ); |
|
| 69 | + $engine = new \Aimeos\MW\View\Engine\Blade(app('Illuminate\Contracts\View\Factory')); |
|
| 70 | + $view = new \Aimeos\MW\View\Standard($templatePaths, array('.blade.php' => $engine)); |
|
| 71 | 71 | |
| 72 | 72 | $config = $context->getConfig(); |
| 73 | 73 | $session = $context->getSession(); |
| 74 | 74 | |
| 75 | - $this->addCsrf( $view ); |
|
| 76 | - $this->addAccess( $view, $context ); |
|
| 77 | - $this->addConfig( $view, $config ); |
|
| 78 | - $this->addNumber( $view, $config ); |
|
| 79 | - $this->addParam( $view ); |
|
| 80 | - $this->addRequest( $view ); |
|
| 81 | - $this->addResponse( $view ); |
|
| 82 | - $this->addSession( $view, $session ); |
|
| 83 | - $this->addTranslate( $view, $locale ); |
|
| 84 | - $this->addUrl( $view ); |
|
| 75 | + $this->addCsrf($view); |
|
| 76 | + $this->addAccess($view, $context); |
|
| 77 | + $this->addConfig($view, $config); |
|
| 78 | + $this->addNumber($view, $config); |
|
| 79 | + $this->addParam($view); |
|
| 80 | + $this->addRequest($view); |
|
| 81 | + $this->addResponse($view); |
|
| 82 | + $this->addSession($view, $session); |
|
| 83 | + $this->addTranslate($view, $locale); |
|
| 84 | + $this->addUrl($view); |
|
| 85 | 85 | |
| 86 | 86 | return $view; |
| 87 | 87 | } |
@@ -94,25 +94,25 @@ discard block |
||
| 94 | 94 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 95 | 95 | * @return \Aimeos\MW\View\Iface Modified view object |
| 96 | 96 | */ |
| 97 | - protected function addAccess( \Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 97 | + protected function addAccess(\Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context) |
|
| 98 | 98 | { |
| 99 | - if( $this->config->get( 'shop.accessControl', true ) === false |
|
| 100 | - || ( ( $user = \Illuminate\Support\Facades\Auth::user() ) !== null && $user->superuser ) |
|
| 99 | + if ($this->config->get('shop.accessControl', true) === false |
|
| 100 | + || (($user = \Illuminate\Support\Facades\Auth::user()) !== null && $user->superuser) |
|
| 101 | 101 | ) { |
| 102 | - $helper = new \Aimeos\MW\View\Helper\Access\All( $view ); |
|
| 102 | + $helper = new \Aimeos\MW\View\Helper\Access\All($view); |
|
| 103 | 103 | } |
| 104 | 104 | else |
| 105 | 105 | { |
| 106 | 106 | $support = $this->support; |
| 107 | 107 | |
| 108 | - $fcn = function() use ( $support, $context ) { |
|
| 109 | - return $support->getGroups( $context ); |
|
| 108 | + $fcn = function() use ($support, $context) { |
|
| 109 | + return $support->getGroups($context); |
|
| 110 | 110 | }; |
| 111 | 111 | |
| 112 | - $helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn ); |
|
| 112 | + $helper = new \Aimeos\MW\View\Helper\Access\Standard($view, $fcn); |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | - $view->addHelper( 'access', $helper ); |
|
| 115 | + $view->addHelper('access', $helper); |
|
| 116 | 116 | |
| 117 | 117 | return $view; |
| 118 | 118 | } |
@@ -125,11 +125,11 @@ discard block |
||
| 125 | 125 | * @param \Aimeos\MW\Config\Iface $config Configuration object |
| 126 | 126 | * @return \Aimeos\MW\View\Iface Modified view object |
| 127 | 127 | */ |
| 128 | - protected function addConfig( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config ) |
|
| 128 | + protected function addConfig(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config) |
|
| 129 | 129 | { |
| 130 | - $config = new \Aimeos\MW\Config\Decorator\Protect( clone $config, array( 'admin', 'client' ) ); |
|
| 131 | - $helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config ); |
|
| 132 | - $view->addHelper( 'config', $helper ); |
|
| 130 | + $config = new \Aimeos\MW\Config\Decorator\Protect(clone $config, array('admin', 'client')); |
|
| 131 | + $helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config); |
|
| 132 | + $view->addHelper('config', $helper); |
|
| 133 | 133 | |
| 134 | 134 | return $view; |
| 135 | 135 | } |
@@ -141,10 +141,10 @@ discard block |
||
| 141 | 141 | * @param \Aimeos\MW\View\Iface $view View object |
| 142 | 142 | * @return \Aimeos\MW\View\Iface Modified view object |
| 143 | 143 | */ |
| 144 | - protected function addCsrf( \Aimeos\MW\View\Iface $view ) |
|
| 144 | + protected function addCsrf(\Aimeos\MW\View\Iface $view) |
|
| 145 | 145 | { |
| 146 | - $helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', csrf_token() ); |
|
| 147 | - $view->addHelper( 'csrf', $helper ); |
|
| 146 | + $helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', csrf_token()); |
|
| 147 | + $view->addHelper('csrf', $helper); |
|
| 148 | 148 | |
| 149 | 149 | return $view; |
| 150 | 150 | } |
@@ -157,14 +157,14 @@ discard block |
||
| 157 | 157 | * @param \Aimeos\MW\Config\Iface $config Configuration object |
| 158 | 158 | * @return \Aimeos\MW\View\Iface Modified view object |
| 159 | 159 | */ |
| 160 | - protected function addNumber( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config ) |
|
| 160 | + protected function addNumber(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config) |
|
| 161 | 161 | { |
| 162 | - $sepDec = $config->get( 'client/html/common/format/separatorDecimal', '.' ); |
|
| 163 | - $sep1000 = $config->get( 'client/html/common/format/separator1000', ' ' ); |
|
| 164 | - $decimals = $config->get( 'client/html/common/format/decimals', 2 ); |
|
| 162 | + $sepDec = $config->get('client/html/common/format/separatorDecimal', '.'); |
|
| 163 | + $sep1000 = $config->get('client/html/common/format/separator1000', ' '); |
|
| 164 | + $decimals = $config->get('client/html/common/format/decimals', 2); |
|
| 165 | 165 | |
| 166 | - $helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000, $decimals ); |
|
| 167 | - $view->addHelper( 'number', $helper ); |
|
| 166 | + $helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000, $decimals); |
|
| 167 | + $view->addHelper('number', $helper); |
|
| 168 | 168 | |
| 169 | 169 | return $view; |
| 170 | 170 | } |
@@ -176,11 +176,11 @@ discard block |
||
| 176 | 176 | * @param \Aimeos\MW\View\Iface $view View object |
| 177 | 177 | * @return \Aimeos\MW\View\Iface Modified view object |
| 178 | 178 | */ |
| 179 | - protected function addParam( \Aimeos\MW\View\Iface $view ) |
|
| 179 | + protected function addParam(\Aimeos\MW\View\Iface $view) |
|
| 180 | 180 | { |
| 181 | - $params = ( Route::current() ? Route::current()->parameters() : array() ) + Input::all(); |
|
| 182 | - $helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params ); |
|
| 183 | - $view->addHelper( 'param', $helper ); |
|
| 181 | + $params = (Route::current() ? Route::current()->parameters() : array()) + Input::all(); |
|
| 182 | + $helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params); |
|
| 183 | + $view->addHelper('param', $helper); |
|
| 184 | 184 | |
| 185 | 185 | return $view; |
| 186 | 186 | } |
@@ -192,10 +192,10 @@ discard block |
||
| 192 | 192 | * @param \Aimeos\MW\View\Iface $view View object |
| 193 | 193 | * @return \Aimeos\MW\View\Iface Modified view object |
| 194 | 194 | */ |
| 195 | - protected function addRequest( \Aimeos\MW\View\Iface $view ) |
|
| 195 | + protected function addRequest(\Aimeos\MW\View\Iface $view) |
|
| 196 | 196 | { |
| 197 | - $helper = new \Aimeos\MW\View\Helper\Request\Laravel5( $view, Request::instance() ); |
|
| 198 | - $view->addHelper( 'request', $helper ); |
|
| 197 | + $helper = new \Aimeos\MW\View\Helper\Request\Laravel5($view, Request::instance()); |
|
| 198 | + $view->addHelper('request', $helper); |
|
| 199 | 199 | |
| 200 | 200 | return $view; |
| 201 | 201 | } |
@@ -207,10 +207,10 @@ discard block |
||
| 207 | 207 | * @param \Aimeos\MW\View\Iface $view View object |
| 208 | 208 | * @return \Aimeos\MW\View\Iface Modified view object |
| 209 | 209 | */ |
| 210 | - protected function addResponse( \Aimeos\MW\View\Iface $view ) |
|
| 210 | + protected function addResponse(\Aimeos\MW\View\Iface $view) |
|
| 211 | 211 | { |
| 212 | - $helper = new \Aimeos\MW\View\Helper\Response\Laravel5( $view ); |
|
| 213 | - $view->addHelper( 'response', $helper ); |
|
| 212 | + $helper = new \Aimeos\MW\View\Helper\Response\Laravel5($view); |
|
| 213 | + $view->addHelper('response', $helper); |
|
| 214 | 214 | |
| 215 | 215 | return $view; |
| 216 | 216 | } |
@@ -223,10 +223,10 @@ discard block |
||
| 223 | 223 | * @param \Aimeos\MW\Session\Iface $session Session object |
| 224 | 224 | * @return \Aimeos\MW\View\Iface Modified view object |
| 225 | 225 | */ |
| 226 | - protected function addSession( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Session\Iface $session ) |
|
| 226 | + protected function addSession(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Session\Iface $session) |
|
| 227 | 227 | { |
| 228 | - $helper = new \Aimeos\MW\View\Helper\Session\Standard( $view, $session ); |
|
| 229 | - $view->addHelper( 'session', $helper ); |
|
| 228 | + $helper = new \Aimeos\MW\View\Helper\Session\Standard($view, $session); |
|
| 229 | + $view->addHelper('session', $helper); |
|
| 230 | 230 | |
| 231 | 231 | return $view; |
| 232 | 232 | } |
@@ -239,20 +239,20 @@ discard block |
||
| 239 | 239 | * @param string|null $locale ISO language code, e.g. "de" or "de_CH" |
| 240 | 240 | * @return \Aimeos\MW\View\Iface Modified view object |
| 241 | 241 | */ |
| 242 | - protected function addTranslate( \Aimeos\MW\View\Iface $view, $locale ) |
|
| 242 | + protected function addTranslate(\Aimeos\MW\View\Iface $view, $locale) |
|
| 243 | 243 | { |
| 244 | - if( $locale !== null ) |
|
| 244 | + if ($locale !== null) |
|
| 245 | 245 | { |
| 246 | - $i18n = $this->i18n->get( array( $locale ) ); |
|
| 246 | + $i18n = $this->i18n->get(array($locale)); |
|
| 247 | 247 | $translation = $i18n[$locale]; |
| 248 | 248 | } |
| 249 | 249 | else |
| 250 | 250 | { |
| 251 | - $translation = new \Aimeos\MW\Translation\None( 'en' ); |
|
| 251 | + $translation = new \Aimeos\MW\Translation\None('en'); |
|
| 252 | 252 | } |
| 253 | 253 | |
| 254 | - $helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation ); |
|
| 255 | - $view->addHelper( 'translate', $helper ); |
|
| 254 | + $helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation); |
|
| 255 | + $view->addHelper('translate', $helper); |
|
| 256 | 256 | |
| 257 | 257 | return $view; |
| 258 | 258 | } |
@@ -264,27 +264,27 @@ discard block |
||
| 264 | 264 | * @param \Aimeos\MW\View\Iface $view View object |
| 265 | 265 | * @return \Aimeos\MW\View\Iface Modified view object |
| 266 | 266 | */ |
| 267 | - protected function addUrl( \Aimeos\MW\View\Iface $view ) |
|
| 267 | + protected function addUrl(\Aimeos\MW\View\Iface $view) |
|
| 268 | 268 | { |
| 269 | 269 | $fixed = array(); |
| 270 | 270 | |
| 271 | - if( Route::current() ) |
|
| 271 | + if (Route::current()) |
|
| 272 | 272 | { |
| 273 | - if( ( $value = Route::input( 'site' ) ) !== null ) { |
|
| 273 | + if (($value = Route::input('site')) !== null) { |
|
| 274 | 274 | $fixed['site'] = $value; |
| 275 | 275 | } |
| 276 | 276 | |
| 277 | - if( ( $value = Route::input( 'locale' ) ) !== null ) { |
|
| 277 | + if (($value = Route::input('locale')) !== null) { |
|
| 278 | 278 | $fixed['locale'] = $value; |
| 279 | 279 | } |
| 280 | 280 | |
| 281 | - if( ( $value = Route::input( 'currency' ) ) !== null ) { |
|
| 281 | + if (($value = Route::input('currency')) !== null) { |
|
| 282 | 282 | $fixed['currency'] = $value; |
| 283 | 283 | } |
| 284 | 284 | } |
| 285 | 285 | |
| 286 | - $helper = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, app('url'), $fixed ); |
|
| 287 | - $view->addHelper( 'url', $helper ); |
|
| 286 | + $helper = new \Aimeos\MW\View\Helper\Url\Laravel5($view, app('url'), $fixed); |
|
| 287 | + $view->addHelper('url', $helper); |
|
| 288 | 288 | |
| 289 | 289 | return $view; |
| 290 | 290 | } |