@@ -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 |
@@ -46,30 +46,30 @@ discard block |
||
46 | 46 | */ |
47 | 47 | public function handle() |
48 | 48 | { |
49 | - $aimeos = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
49 | + $aimeos = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get(); |
|
50 | 50 | $context = $this->getContext(); |
51 | 51 | |
52 | 52 | $process = $context->getProcess(); |
53 | - $jobs = explode( ' ', $this->argument( 'jobs' ) ); |
|
54 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
53 | + $jobs = explode(' ', $this->argument('jobs')); |
|
54 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
55 | 55 | |
56 | - foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem ) |
|
56 | + foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem) |
|
57 | 57 | { |
58 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
59 | - $localeItem->setLanguageId( null ); |
|
60 | - $localeItem->setCurrencyId( null ); |
|
58 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
59 | + $localeItem->setLanguageId(null); |
|
60 | + $localeItem->setCurrencyId(null); |
|
61 | 61 | |
62 | - $context->setLocale( $localeItem ); |
|
62 | + $context->setLocale($localeItem); |
|
63 | 63 | |
64 | - $this->info( sprintf( 'Executing the Aimeos jobs for "%s"', $siteItem->getCode() ) ); |
|
64 | + $this->info(sprintf('Executing the Aimeos jobs for "%s"', $siteItem->getCode())); |
|
65 | 65 | |
66 | - foreach( $jobs as $jobname ) |
|
66 | + foreach ($jobs as $jobname) |
|
67 | 67 | { |
68 | - $fcn = function( $context, $aimeos, $jobname ) { |
|
69 | - \Aimeos\Controller\Jobs\Factory::createController( $context, $aimeos, $jobname )->run(); |
|
68 | + $fcn = function($context, $aimeos, $jobname) { |
|
69 | + \Aimeos\Controller\Jobs\Factory::createController($context, $aimeos, $jobname)->run(); |
|
70 | 70 | }; |
71 | 71 | |
72 | - $process->start( $fcn, [$context, $aimeos, $jobname], true ); |
|
72 | + $process->start($fcn, [$context, $aimeos, $jobname], true); |
|
73 | 73 | } |
74 | 74 | } |
75 | 75 | |
@@ -85,19 +85,19 @@ discard block |
||
85 | 85 | protected function getContext() |
86 | 86 | { |
87 | 87 | $lv = $this->getLaravel(); |
88 | - $aimeos = $lv->make( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
89 | - $context = $lv->make( '\Aimeos\Shop\Base\Context' )->get( false, 'command' ); |
|
88 | + $aimeos = $lv->make('\Aimeos\Shop\Base\Aimeos')->get(); |
|
89 | + $context = $lv->make('\Aimeos\Shop\Base\Context')->get(false, 'command'); |
|
90 | 90 | |
91 | - $tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' ); |
|
92 | - $view = $lv->make( '\Aimeos\Shop\Base\View' )->create( $context, $tmplPaths ); |
|
91 | + $tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates'); |
|
92 | + $view = $lv->make('\Aimeos\Shop\Base\View')->create($context, $tmplPaths); |
|
93 | 93 | |
94 | - $langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context )->getSubManager( 'language' ); |
|
95 | - $langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) ); |
|
96 | - $i18n = $lv->make( '\Aimeos\Shop\Base\I18n' )->get( $langids ); |
|
94 | + $langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context)->getSubManager('language'); |
|
95 | + $langids = array_keys($langManager->searchItems($langManager->createSearch(true))); |
|
96 | + $i18n = $lv->make('\Aimeos\Shop\Base\I18n')->get($langids); |
|
97 | 97 | |
98 | - $context->setEditor( 'aimeos:jobs' ); |
|
99 | - $context->setView( $view ); |
|
100 | - $context->setI18n( $i18n ); |
|
98 | + $context->setEditor('aimeos:jobs'); |
|
99 | + $context->setView($view); |
|
100 | + $context->setI18n($i18n); |
|
101 | 101 | |
102 | 102 | return $context; |
103 | 103 | } |
@@ -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 | } |
@@ -44,24 +44,24 @@ |
||
44 | 44 | */ |
45 | 45 | public function handle() |
46 | 46 | { |
47 | - $context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false, 'command' ); |
|
48 | - $context->setEditor( 'aimeos:cache' ); |
|
47 | + $context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false, 'command'); |
|
48 | + $context->setEditor('aimeos:cache'); |
|
49 | 49 | |
50 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
50 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
51 | 51 | |
52 | - foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem ) |
|
52 | + foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem) |
|
53 | 53 | { |
54 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
54 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
55 | 55 | |
56 | 56 | $lcontext = clone $context; |
57 | - $lcontext->setLocale( $localeItem ); |
|
57 | + $lcontext->setLocale($localeItem); |
|
58 | 58 | |
59 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext ); |
|
60 | - $lcontext->setCache( $cache ); |
|
59 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext); |
|
60 | + $lcontext->setCache($cache); |
|
61 | 61 | |
62 | - $this->info( sprintf( 'Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode() ) ); |
|
62 | + $this->info(sprintf('Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode())); |
|
63 | 63 | |
64 | - \Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->clear(); |
|
64 | + \Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->clear(); |
|
65 | 65 | } |
66 | 66 | } |
67 | 67 | } |
@@ -34,7 +34,7 @@ |
||
34 | 34 | * Returns the initial HTML view for the admin interface. |
35 | 35 | * |
36 | 36 | * @param \Illuminate\Http\Request $request Laravel request object |
37 | - * @return \Illuminate\Contracts\View\View View for rendering the output |
|
37 | + * @return \Illuminate\Http\RedirectResponse View for rendering the output |
|
38 | 38 | */ |
39 | 39 | public function indexAction( Request $request ) |
40 | 40 | { |
@@ -36,26 +36,26 @@ |
||
36 | 36 | * @param \Illuminate\Http\Request $request Laravel request object |
37 | 37 | * @return \Illuminate\Contracts\View\View View for rendering the output |
38 | 38 | */ |
39 | - public function indexAction( Request $request ) |
|
39 | + public function indexAction(Request $request) |
|
40 | 40 | { |
41 | - if( Auth::check() === false |
|
42 | - || $request->user()->can( 'admin', [AdminController::class, ['admin', 'editor']] ) === false |
|
41 | + if (Auth::check() === false |
|
42 | + || $request->user()->can('admin', [AdminController::class, ['admin', 'editor']]) === false |
|
43 | 43 | ) { |
44 | - return redirect()->guest( 'login' ); |
|
44 | + return redirect()->guest('login'); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | $siteId = $request->user()->siteid; |
48 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false ); |
|
49 | - $siteManager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' ); |
|
50 | - $siteCode = ( $siteId ? $siteManager->getItem( $siteId )->getCode() : 'default' ); |
|
51 | - $locale = $request->user()->langid ?: config( 'app.locale', 'en' ); |
|
48 | + $context = app('\Aimeos\Shop\Base\Context')->get(false); |
|
49 | + $siteManager = \Aimeos\MShop\Factory::createManager($context, 'locale/site'); |
|
50 | + $siteCode = ($siteId ? $siteManager->getItem($siteId)->getCode() : 'default'); |
|
51 | + $locale = $request->user()->langid ?: config('app.locale', 'en'); |
|
52 | 52 | |
53 | 53 | $param = array( |
54 | 54 | 'resource' => 'dashboard', |
55 | - 'site' => Route::input( 'site', Input::get( 'site', $siteCode ) ), |
|
56 | - 'lang' => Route::input( 'lang', Input::get( 'lang', $locale ) ) |
|
55 | + 'site' => Route::input('site', Input::get('site', $siteCode)), |
|
56 | + 'lang' => Route::input('lang', Input::get('lang', $locale)) |
|
57 | 57 | ); |
58 | 58 | |
59 | - return redirect()->route( 'aimeos_shop_jqadm_search', $param ); |
|
59 | + return redirect()->route('aimeos_shop_jqadm_search', $param); |
|
60 | 60 | } |
61 | 61 | } |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | Route::group(config('shop.routes.login', ['prefix' => 'admin', 'middleware' => ['web']]), function() { |
4 | 4 | |
5 | - Route::match( array( 'GET' ), '', array( |
|
5 | + Route::match(array('GET'), '', array( |
|
6 | 6 | 'as' => 'aimeos_shop_admin', |
7 | 7 | 'uses' => 'Aimeos\Shop\Controller\AdminController@indexAction' |
8 | 8 | )); |
@@ -12,112 +12,112 @@ discard block |
||
12 | 12 | |
13 | 13 | Route::group(config('shop.routes.jqadm', ['prefix' => 'admin/{site}/jqadm', 'middleware' => ['web', 'auth']]), function() { |
14 | 14 | |
15 | - Route::match( array( 'GET' ), 'file/{type}', array( |
|
15 | + Route::match(array('GET'), 'file/{type}', array( |
|
16 | 16 | 'as' => 'aimeos_shop_jqadm_file', |
17 | 17 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@fileAction' |
18 | 18 | )); |
19 | 19 | |
20 | - Route::match( array( 'GET', 'POST' ), 'copy/{resource}/{id}', array( |
|
20 | + Route::match(array('GET', 'POST'), 'copy/{resource}/{id}', array( |
|
21 | 21 | 'as' => 'aimeos_shop_jqadm_copy', |
22 | 22 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@copyAction' |
23 | - ))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]+' ) ); |
|
23 | + ))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]+')); |
|
24 | 24 | |
25 | - Route::match( array( 'GET', 'POST' ), 'create/{resource}', array( |
|
25 | + Route::match(array('GET', 'POST'), 'create/{resource}', array( |
|
26 | 26 | 'as' => 'aimeos_shop_jqadm_create', |
27 | 27 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@createAction' |
28 | - ))->where( array( 'resource' => '[^0-9A-Z\-\_]+' ) ); |
|
28 | + ))->where(array('resource' => '[^0-9A-Z\-\_]+')); |
|
29 | 29 | |
30 | - Route::match( array( 'GET', 'POST' ), 'delete/{resource}/{id}', array( |
|
30 | + Route::match(array('GET', 'POST'), 'delete/{resource}/{id}', array( |
|
31 | 31 | 'as' => 'aimeos_shop_jqadm_delete', |
32 | 32 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@deleteAction' |
33 | - ))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]+' ) ); |
|
33 | + ))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]+')); |
|
34 | 34 | |
35 | - Route::match( array( 'GET', 'POST' ), 'export/{resource}', array( |
|
35 | + Route::match(array('GET', 'POST'), 'export/{resource}', array( |
|
36 | 36 | 'as' => 'aimeos_shop_jqadm_export', |
37 | 37 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@exportAction' |
38 | - ))->where( array( 'resource' => '[^0-9A-Z\-\_]+' ) ); |
|
38 | + ))->where(array('resource' => '[^0-9A-Z\-\_]+')); |
|
39 | 39 | |
40 | - Route::match( array( 'GET' ), 'get/{resource}/{id}', array( |
|
40 | + Route::match(array('GET'), 'get/{resource}/{id}', array( |
|
41 | 41 | 'as' => 'aimeos_shop_jqadm_get', |
42 | 42 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@getAction' |
43 | - ))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]+' ) ); |
|
43 | + ))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]+')); |
|
44 | 44 | |
45 | - Route::match( array( 'POST' ), 'save/{resource}', array( |
|
45 | + Route::match(array('POST'), 'save/{resource}', array( |
|
46 | 46 | 'as' => 'aimeos_shop_jqadm_save', |
47 | 47 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@saveAction' |
48 | - ))->where( array( 'resource' => '[^0-9A-Z\-\_]+' ) ); |
|
48 | + ))->where(array('resource' => '[^0-9A-Z\-\_]+')); |
|
49 | 49 | |
50 | - Route::match( array( 'GET', 'POST' ), 'search/{resource}', array( |
|
50 | + Route::match(array('GET', 'POST'), 'search/{resource}', array( |
|
51 | 51 | 'as' => 'aimeos_shop_jqadm_search', |
52 | 52 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@searchAction' |
53 | - ))->where( array( 'resource' => '[^0-9A-Z\-\_]+' ) ); |
|
53 | + ))->where(array('resource' => '[^0-9A-Z\-\_]+')); |
|
54 | 54 | |
55 | 55 | }); |
56 | 56 | |
57 | 57 | |
58 | 58 | Route::group(config('shop.routes.jsonadm', ['prefix' => 'admin/{site}/jsonadm', 'middleware' => ['web', 'auth']]), function() { |
59 | 59 | |
60 | - Route::match( array( 'DELETE' ), '{resource}/{id?}', array( |
|
60 | + Route::match(array('DELETE'), '{resource}/{id?}', array( |
|
61 | 61 | 'as' => 'aimeos_shop_jsonadm_delete', |
62 | 62 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@deleteAction' |
63 | - ))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*' ) ); |
|
63 | + ))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*')); |
|
64 | 64 | |
65 | - Route::match( array( 'GET' ), '{resource}/{id?}', array( |
|
65 | + Route::match(array('GET'), '{resource}/{id?}', array( |
|
66 | 66 | 'as' => 'aimeos_shop_jsonadm_get', |
67 | 67 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@getAction' |
68 | - ))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*' ) ); |
|
68 | + ))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*')); |
|
69 | 69 | |
70 | - Route::match( array( 'PATCH' ), '{resource}/{id?}', array( |
|
70 | + Route::match(array('PATCH'), '{resource}/{id?}', array( |
|
71 | 71 | 'as' => 'aimeos_shop_jsonadm_patch', |
72 | 72 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@patchAction' |
73 | - ))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*' ) ); |
|
73 | + ))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*')); |
|
74 | 74 | |
75 | - Route::match( array( 'POST' ), '{resource}/{id?}', array( |
|
75 | + Route::match(array('POST'), '{resource}/{id?}', array( |
|
76 | 76 | 'as' => 'aimeos_shop_jsonadm_post', |
77 | 77 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@postAction' |
78 | - ))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*' ) ); |
|
78 | + ))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*')); |
|
79 | 79 | |
80 | - Route::match( array( 'PUT' ), '{resource}/{id?}', array( |
|
80 | + Route::match(array('PUT'), '{resource}/{id?}', array( |
|
81 | 81 | 'as' => 'aimeos_shop_jsonadm_put', |
82 | 82 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@putAction' |
83 | - ))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*' ) ); |
|
83 | + ))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*')); |
|
84 | 84 | |
85 | - Route::match( array( 'OPTIONS' ), '{resource?}', array( |
|
85 | + Route::match(array('OPTIONS'), '{resource?}', array( |
|
86 | 86 | 'as' => 'aimeos_shop_jsonadm_options', |
87 | 87 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@optionsAction' |
88 | - ))->where( array( 'resource' => '[^0-9A-Z\-\_]*' ) ); |
|
88 | + ))->where(array('resource' => '[^0-9A-Z\-\_]*')); |
|
89 | 89 | |
90 | 90 | }); |
91 | 91 | |
92 | 92 | |
93 | 93 | Route::group(config('shop.routes.jsonapi', ['prefix' => 'jsonapi', 'middleware' => ['web', 'api']]), function() { |
94 | 94 | |
95 | - Route::match( array( 'DELETE' ), '{resource}', array( |
|
95 | + Route::match(array('DELETE'), '{resource}', array( |
|
96 | 96 | 'as' => 'aimeos_shop_jsonapi_delete', |
97 | 97 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@deleteAction' |
98 | 98 | )); |
99 | 99 | |
100 | - Route::match( array( 'GET' ), '{resource}', array( |
|
100 | + Route::match(array('GET'), '{resource}', array( |
|
101 | 101 | 'as' => 'aimeos_shop_jsonapi_get', |
102 | 102 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@getAction' |
103 | 103 | )); |
104 | 104 | |
105 | - Route::match( array( 'PATCH' ), '{resource}', array( |
|
105 | + Route::match(array('PATCH'), '{resource}', array( |
|
106 | 106 | 'as' => 'aimeos_shop_jsonapi_patch', |
107 | 107 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@patchAction' |
108 | 108 | )); |
109 | 109 | |
110 | - Route::match( array( 'POST' ), '{resource}', array( |
|
110 | + Route::match(array('POST'), '{resource}', array( |
|
111 | 111 | 'as' => 'aimeos_shop_jsonapi_post', |
112 | 112 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@postAction' |
113 | 113 | )); |
114 | 114 | |
115 | - Route::match( array( 'PUT' ), '{resource}', array( |
|
115 | + Route::match(array('PUT'), '{resource}', array( |
|
116 | 116 | 'as' => 'aimeos_shop_jsonapi_put', |
117 | 117 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@putAction' |
118 | 118 | )); |
119 | 119 | |
120 | - Route::match( array( 'OPTIONS' ), '{resource?}', array( |
|
120 | + Route::match(array('OPTIONS'), '{resource?}', array( |
|
121 | 121 | 'as' => 'aimeos_shop_jsonapi_options', |
122 | 122 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@optionsAction' |
123 | 123 | )); |
@@ -127,22 +127,22 @@ discard block |
||
127 | 127 | |
128 | 128 | Route::group(config('shop.routes.account', ['middleware' => ['web', 'auth']]), function() { |
129 | 129 | |
130 | - Route::match( array( 'GET', 'POST' ), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
130 | + Route::match(array('GET', 'POST'), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
131 | 131 | 'as' => 'aimeos_shop_account_favorite', |
132 | 132 | 'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction' |
133 | 133 | )); |
134 | 134 | |
135 | - Route::match( array( 'GET', 'POST' ), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
135 | + Route::match(array('GET', 'POST'), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
136 | 136 | 'as' => 'aimeos_shop_account_watch', |
137 | 137 | 'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction' |
138 | 138 | )); |
139 | 139 | |
140 | - Route::match( array( 'GET', 'POST' ), 'myaccount/download/{dl_id}', array( |
|
140 | + Route::match(array('GET', 'POST'), 'myaccount/download/{dl_id}', array( |
|
141 | 141 | 'as' => 'aimeos_shop_account_download', |
142 | 142 | 'uses' => 'Aimeos\Shop\Controller\AccountController@downloadAction' |
143 | 143 | )); |
144 | 144 | |
145 | - Route::match( array( 'GET', 'POST' ), 'myaccount', array( |
|
145 | + Route::match(array('GET', 'POST'), 'myaccount', array( |
|
146 | 146 | 'as' => 'aimeos_shop_account', |
147 | 147 | 'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction' |
148 | 148 | )); |
@@ -152,47 +152,47 @@ discard block |
||
152 | 152 | |
153 | 153 | Route::group(config('shop.routes.default', ['middleware' => ['web']]), function() { |
154 | 154 | |
155 | - Route::match( array( 'GET', 'POST' ), 'count', array( |
|
155 | + Route::match(array('GET', 'POST'), 'count', array( |
|
156 | 156 | 'as' => 'aimeos_shop_count', |
157 | 157 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@countAction' |
158 | 158 | )); |
159 | 159 | |
160 | - Route::match( array( 'GET', 'POST' ), 'detail/{d_prodid}/{d_name?}/{d_pos?}', array( |
|
160 | + Route::match(array('GET', 'POST'), 'detail/{d_prodid}/{d_name?}/{d_pos?}', array( |
|
161 | 161 | 'as' => 'aimeos_shop_detail', |
162 | 162 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction' |
163 | 163 | )); |
164 | 164 | |
165 | - Route::match( array( 'GET', 'POST' ), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
165 | + Route::match(array('GET', 'POST'), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
166 | 166 | 'as' => 'aimeos_shop_session_pinned', |
167 | 167 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction' |
168 | 168 | )); |
169 | 169 | |
170 | - Route::match( array( 'GET', 'POST' ), 'list', array( |
|
170 | + Route::match(array('GET', 'POST'), 'list', array( |
|
171 | 171 | 'as' => 'aimeos_shop_list', |
172 | 172 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@listAction' |
173 | 173 | )); |
174 | 174 | |
175 | - Route::match( array( 'GET', 'POST' ), 'suggest', array( |
|
175 | + Route::match(array('GET', 'POST'), 'suggest', array( |
|
176 | 176 | 'as' => 'aimeos_shop_suggest', |
177 | 177 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@suggestAction' |
178 | 178 | )); |
179 | 179 | |
180 | - Route::match( array( 'GET', 'POST' ), 'stock', array( |
|
180 | + Route::match(array('GET', 'POST'), 'stock', array( |
|
181 | 181 | 'as' => 'aimeos_shop_stock', |
182 | 182 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@stockAction' |
183 | 183 | )); |
184 | 184 | |
185 | - Route::match( array( 'GET', 'POST' ), 'basket', array( |
|
185 | + Route::match(array('GET', 'POST'), 'basket', array( |
|
186 | 186 | 'as' => 'aimeos_shop_basket', |
187 | 187 | 'uses' => 'Aimeos\Shop\Controller\BasketController@indexAction' |
188 | 188 | )); |
189 | 189 | |
190 | - Route::match( array( 'GET', 'POST' ), 'checkout/{c_step?}', array( |
|
190 | + Route::match(array('GET', 'POST'), 'checkout/{c_step?}', array( |
|
191 | 191 | 'as' => 'aimeos_shop_checkout', |
192 | 192 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@indexAction' |
193 | 193 | )); |
194 | 194 | |
195 | - Route::match( array( 'GET', 'POST' ), 'confirm/{code?}', array( |
|
195 | + Route::match(array('GET', 'POST'), 'confirm/{code?}', array( |
|
196 | 196 | 'as' => 'aimeos_shop_confirm', |
197 | 197 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction' |
198 | 198 | )); |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | |
203 | 203 | Route::group(config('shop.routes.update', []), function() { |
204 | 204 | |
205 | - Route::match( array( 'GET', 'POST' ), 'update', array( |
|
205 | + Route::match(array('GET', 'POST'), 'update', array( |
|
206 | 206 | 'as' => 'aimeos_shop_update', |
207 | 207 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@updateAction' |
208 | 208 | )); |
@@ -53,9 +53,9 @@ discard block |
||
53 | 53 | * @param \Aimeos\Shop\Base\Locale $locale Locale object |
54 | 54 | * @param \Aimeos\Shop\Base\View $view View object |
55 | 55 | */ |
56 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, |
|
56 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, |
|
57 | 57 | \Aimeos\Shop\Base\Aimeos $aimeos, \Aimeos\Shop\Base\Context $context, |
58 | - \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view ) |
|
58 | + \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view) |
|
59 | 59 | { |
60 | 60 | $this->config = $config; |
61 | 61 | $this->aimeos = $aimeos; |
@@ -71,21 +71,21 @@ discard block |
||
71 | 71 | * @param string $pageName Name of the configured page |
72 | 72 | * @return array Associative list with body and header output separated by client name |
73 | 73 | */ |
74 | - public function getSections( $pageName ) |
|
74 | + public function getSections($pageName) |
|
75 | 75 | { |
76 | 76 | $context = $this->context->get(); |
77 | 77 | $langid = $context->getLocale()->getLanguageId(); |
78 | - $tmplPaths = $this->aimeos->get()->getCustomPaths( 'client/html/templates' ); |
|
79 | - $view = $this->view->create( $context, $tmplPaths, $langid ); |
|
80 | - $context->setView( $view ); |
|
78 | + $tmplPaths = $this->aimeos->get()->getCustomPaths('client/html/templates'); |
|
79 | + $view = $this->view->create($context, $tmplPaths, $langid); |
|
80 | + $context->setView($view); |
|
81 | 81 | |
82 | - $result = array( 'aibody' => array(), 'aiheader' => array() ); |
|
83 | - $page = $context->getConfig()->get( 'page/' . $pageName, array() ); |
|
82 | + $result = array('aibody' => array(), 'aiheader' => array()); |
|
83 | + $page = $context->getConfig()->get('page/'.$pageName, array()); |
|
84 | 84 | |
85 | - foreach( (array) $page as $clientName ) |
|
85 | + foreach ((array) $page as $clientName) |
|
86 | 86 | { |
87 | - $client = \Aimeos\Client\Html\Factory::createClient( $context, $clientName ); |
|
88 | - $client->setView( clone $view ); |
|
87 | + $client = \Aimeos\Client\Html\Factory::createClient($context, $clientName); |
|
88 | + $client->setView(clone $view); |
|
89 | 89 | $client->process(); |
90 | 90 | |
91 | 91 | $result['aibody'][$clientName] = $client->getBody(); |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public function indexAction() |
31 | 31 | { |
32 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'account-index' ); |
|
32 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('account-index'); |
|
33 | 33 | return Response::view('shop::account.index', $params); |
34 | 34 | } |
35 | 35 | |
@@ -41,17 +41,17 @@ discard block |
||
41 | 41 | */ |
42 | 42 | public function downloadAction() |
43 | 43 | { |
44 | - $context = app( '\Aimeos\Shop\Base\Context' )->get(); |
|
44 | + $context = app('\Aimeos\Shop\Base\Context')->get(); |
|
45 | 45 | $langid = $context->getLocale()->getLanguageId(); |
46 | 46 | |
47 | - $view = app( '\Aimeos\Shop\Base\View' )->create( $context, array(), $langid ); |
|
48 | - $context->setView( $view ); |
|
47 | + $view = app('\Aimeos\Shop\Base\View')->create($context, array(), $langid); |
|
48 | + $context->setView($view); |
|
49 | 49 | |
50 | - $client = \Aimeos\Client\Html\Factory::createClient( $context, 'account/download' ); |
|
51 | - $client->setView( $view ); |
|
50 | + $client = \Aimeos\Client\Html\Factory::createClient($context, 'account/download'); |
|
51 | + $client->setView($view); |
|
52 | 52 | $client->process(); |
53 | 53 | |
54 | 54 | $response = $view->response(); |
55 | - return Response::make( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() ); |
|
55 | + return Response::make((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders()); |
|
56 | 56 | } |
57 | 57 | } |
58 | 58 | \ No newline at end of file |
@@ -31,9 +31,9 @@ discard block |
||
31 | 31 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
32 | 32 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
33 | 33 | */ |
34 | - public function deleteAction( ServerRequestInterface $request ) |
|
34 | + public function deleteAction(ServerRequestInterface $request) |
|
35 | 35 | { |
36 | - return $this->createClient()->delete( $request, new Response() ); |
|
36 | + return $this->createClient()->delete($request, new Response()); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | |
@@ -43,9 +43,9 @@ discard block |
||
43 | 43 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
44 | 44 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
45 | 45 | */ |
46 | - public function getAction( ServerRequestInterface $request ) |
|
46 | + public function getAction(ServerRequestInterface $request) |
|
47 | 47 | { |
48 | - return $this->createClient()->get( $request, new Response() ); |
|
48 | + return $this->createClient()->get($request, new Response()); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | |
@@ -55,9 +55,9 @@ discard block |
||
55 | 55 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
56 | 56 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
57 | 57 | */ |
58 | - public function patchAction( ServerRequestInterface $request ) |
|
58 | + public function patchAction(ServerRequestInterface $request) |
|
59 | 59 | { |
60 | - return $this->createClient()->patch( $request, new Response() ); |
|
60 | + return $this->createClient()->patch($request, new Response()); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | |
@@ -67,9 +67,9 @@ discard block |
||
67 | 67 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
68 | 68 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
69 | 69 | */ |
70 | - public function postAction( ServerRequestInterface $request ) |
|
70 | + public function postAction(ServerRequestInterface $request) |
|
71 | 71 | { |
72 | - return $this->createClient()->post( $request, new Response() ); |
|
72 | + return $this->createClient()->post($request, new Response()); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | |
@@ -79,9 +79,9 @@ discard block |
||
79 | 79 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
80 | 80 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
81 | 81 | */ |
82 | - public function putAction( ServerRequestInterface $request ) |
|
82 | + public function putAction(ServerRequestInterface $request) |
|
83 | 83 | { |
84 | - return $this->createClient()->put( $request, new Response() ); |
|
84 | + return $this->createClient()->put($request, new Response()); |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | |
@@ -91,9 +91,9 @@ discard block |
||
91 | 91 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
92 | 92 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
93 | 93 | */ |
94 | - public function optionsAction( ServerRequestInterface $request ) |
|
94 | + public function optionsAction(ServerRequestInterface $request) |
|
95 | 95 | { |
96 | - return $this->createClient()->options( $request, new Response() ); |
|
96 | + return $this->createClient()->options($request, new Response()); |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | |
@@ -104,17 +104,17 @@ discard block |
||
104 | 104 | */ |
105 | 105 | protected function createClient() |
106 | 106 | { |
107 | - $resource = Route::input( 'resource' ); |
|
108 | - $related = Route::input( 'related', Input::get( 'related' ) ); |
|
107 | + $resource = Route::input('resource'); |
|
108 | + $related = Route::input('related', Input::get('related')); |
|
109 | 109 | |
110 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
111 | - $tmplPaths = $aimeos->getCustomPaths( 'client/jsonapi/templates' ); |
|
110 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
111 | + $tmplPaths = $aimeos->getCustomPaths('client/jsonapi/templates'); |
|
112 | 112 | |
113 | - $context = app( '\Aimeos\Shop\Base\Context' )->get(); |
|
113 | + $context = app('\Aimeos\Shop\Base\Context')->get(); |
|
114 | 114 | $langid = $context->getLocale()->getLanguageId(); |
115 | 115 | |
116 | - $context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $tmplPaths, $langid ) ); |
|
116 | + $context->setView(app('\Aimeos\Shop\Base\View')->create($context, $tmplPaths, $langid)); |
|
117 | 117 | |
118 | - return \Aimeos\Client\JsonApi\Factory::createClient( $context, $resource . '/' . $related ); |
|
118 | + return \Aimeos\Client\JsonApi\Factory::createClient($context, $resource.'/'.$related); |
|
119 | 119 | } |
120 | 120 | } |