@@ -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 |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public function countAction() |
31 | 31 | { |
32 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'catalog-count' ); |
|
32 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('catalog-count'); |
|
33 | 33 | |
34 | 34 | return Response::view('shop::catalog.count', $params) |
35 | 35 | ->header('Content-Type', 'application/javascript'); |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | */ |
44 | 44 | public function detailAction() |
45 | 45 | { |
46 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-detail' ); |
|
46 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-detail'); |
|
47 | 47 | return Response::view('shop::catalog.detail', $params); |
48 | 48 | } |
49 | 49 | |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | */ |
56 | 56 | public function listAction() |
57 | 57 | { |
58 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-list' ); |
|
58 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-list'); |
|
59 | 59 | return Response::view('shop::catalog.list', $params); |
60 | 60 | } |
61 | 61 | |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | */ |
68 | 68 | public function stockAction() |
69 | 69 | { |
70 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-stock' ); |
|
70 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-stock'); |
|
71 | 71 | |
72 | 72 | return Response::view('shop::catalog.stock', $params) |
73 | 73 | ->header('Content-Type', 'application/javascript'); |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | */ |
82 | 82 | public function suggestAction() |
83 | 83 | { |
84 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-suggest' ); |
|
84 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-suggest'); |
|
85 | 85 | |
86 | 86 | return Response::view('shop::catalog.suggest', $params) |
87 | 87 | ->header('Content-Type', 'application/json'); |
@@ -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 | } |