@@ -4,28 +4,28 @@ |
||
4 | 4 | { |
5 | 5 | public function testAccountCommandNew() |
6 | 6 | { |
7 | - $args = array('site' => 'unittest', 'email' => '[email protected]', '--password' => 'test'); |
|
8 | - $this->assertEquals(0, $this->artisan('aimeos:account', $args)); |
|
7 | + $args = array( 'site' => 'unittest', 'email' => '[email protected]', '--password' => 'test' ); |
|
8 | + $this->assertEquals( 0, $this->artisan( 'aimeos:account', $args ) ); |
|
9 | 9 | } |
10 | 10 | |
11 | 11 | |
12 | 12 | public function testAccountCommandAdmin() |
13 | 13 | { |
14 | - $args = array('site' => 'unittest', 'email' => '[email protected]', '--password' => 'test', '--admin' => true); |
|
15 | - $this->assertEquals(0, $this->artisan('aimeos:account', $args)); |
|
14 | + $args = array( 'site' => 'unittest', 'email' => '[email protected]', '--password' => 'test', '--admin' => true ); |
|
15 | + $this->assertEquals( 0, $this->artisan( 'aimeos:account', $args ) ); |
|
16 | 16 | } |
17 | 17 | |
18 | 18 | |
19 | 19 | public function testAccountCommandApi() |
20 | 20 | { |
21 | - $args = array('site' => 'unittest', 'email' => '[email protected]', '--password' => 'test', '--api' => true); |
|
22 | - $this->assertEquals(0, $this->artisan('aimeos:account', $args)); |
|
21 | + $args = array( 'site' => 'unittest', 'email' => '[email protected]', '--password' => 'test', '--api' => true ); |
|
22 | + $this->assertEquals( 0, $this->artisan( 'aimeos:account', $args ) ); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | |
26 | 26 | public function testAccountCommandEditor() |
27 | 27 | { |
28 | - $args = array('site' => 'unittest', 'email' => '[email protected]', '--password' => 'test', '--editor' => true); |
|
29 | - $this->assertEquals(0, $this->artisan('aimeos:account', $args)); |
|
28 | + $args = array( 'site' => 'unittest', 'email' => '[email protected]', '--password' => 'test', '--editor' => true ); |
|
29 | + $this->assertEquals( 0, $this->artisan( 'aimeos:account', $args ) ); |
|
30 | 30 | } |
31 | 31 | } |
@@ -141,8 +141,8 @@ |
||
141 | 141 | $templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' ); |
142 | 142 | |
143 | 143 | $context = app( 'aimeos.context' )->get( false, 'backend' ); |
144 | - $context->setI18n( app('aimeos.i18n')->get( array( $lang, 'en' ) ) ); |
|
145 | - $context->setLocale( app('aimeos.locale')->getBackend( $context, $site ) ); |
|
144 | + $context->setI18n( app( 'aimeos.i18n' )->get( array( $lang, 'en' ) ) ); |
|
145 | + $context->setLocale( app( 'aimeos.locale' )->getBackend( $context, $site ) ); |
|
146 | 146 | $context->setView( app( 'aimeos.view' )->create( $context, $templatePaths, $lang ) ); |
147 | 147 | |
148 | 148 | return \Aimeos\Admin\JsonAdm::create( $context, $aimeos, $resource ); |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | $params['aibody'][$name] = Shop::get( $name )->getBody(); |
37 | 37 | } |
38 | 38 | |
39 | - return Response::view('shop::checkout.confirm', $params)->header('Cache-Control', 'no-store'); |
|
39 | + return Response::view( 'shop::checkout.confirm', $params )->header( 'Cache-Control', 'no-store' ); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | $params['aibody'][$name] = Shop::get( $name )->getBody(); |
54 | 54 | } |
55 | 55 | |
56 | - return Response::view('shop::checkout.index', $params)->header('Cache-Control', 'no-store'); |
|
56 | + return Response::view( 'shop::checkout.index', $params )->header( 'Cache-Control', 'no-store' ); |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | |
@@ -70,6 +70,6 @@ discard block |
||
70 | 70 | $params['aibody'][$name] = Shop::get( $name )->getBody(); |
71 | 71 | } |
72 | 72 | |
73 | - return Response::view('shop::checkout.update', $params)->header('Cache-Control', 'no-store'); |
|
73 | + return Response::view( 'shop::checkout.update', $params )->header( 'Cache-Control', 'no-store' ); |
|
74 | 74 | } |
75 | 75 | } |
76 | 76 | \ No newline at end of file |
@@ -234,8 +234,8 @@ |
||
234 | 234 | $paths = $aimeos->getCustomPaths( 'admin/jqadm/templates' ); |
235 | 235 | |
236 | 236 | $context = app( 'aimeos.context' )->get( false, 'backend' ); |
237 | - $context->setI18n( app('aimeos.i18n')->get( array( $lang, 'en' ) ) ); |
|
238 | - $context->setLocale( app('aimeos.locale')->getBackend( $context, $site ) ); |
|
237 | + $context->setI18n( app( 'aimeos.i18n' )->get( array( $lang, 'en' ) ) ); |
|
238 | + $context->setLocale( app( 'aimeos.locale' )->getBackend( $context, $site ) ); |
|
239 | 239 | |
240 | 240 | $view = app( 'aimeos.view' )->create( $context, $paths, $lang ); |
241 | 241 |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public function privacyAction() |
31 | 31 | { |
32 | - return View::make('shop::page.privacy'); |
|
32 | + return View::make( 'shop::page.privacy' ); |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | |
@@ -40,6 +40,6 @@ discard block |
||
40 | 40 | */ |
41 | 41 | public function termsAction() |
42 | 42 | { |
43 | - return View::make('shop::page.terms'); |
|
43 | + return View::make( 'shop::page.terms' ); |
|
44 | 44 | } |
45 | 45 | } |
46 | 46 | \ No newline at end of file |
@@ -85,11 +85,11 @@ |
||
85 | 85 | $this->addMessageQueueManager( $context ); |
86 | 86 | $this->addLogger( $context ); |
87 | 87 | $this->addCache( $context ); |
88 | - $this->addMailer( $context); |
|
88 | + $this->addMailer( $context ); |
|
89 | 89 | $this->addProcess( $context ); |
90 | 90 | $this->addSession( $context ); |
91 | - $this->addUser( $context); |
|
92 | - $this->addGroups( $context); |
|
91 | + $this->addUser( $context ); |
|
92 | + $this->addGroups( $context ); |
|
93 | 93 | |
94 | 94 | $this->context = $context; |
95 | 95 | } |
@@ -283,7 +283,7 @@ |
||
283 | 283 | } |
284 | 284 | } |
285 | 285 | |
286 | - $helper = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, app('url'), $fixed ); |
|
286 | + $helper = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, app( 'url' ), $fixed ); |
|
287 | 287 | $view->addHelper( 'url', $helper ); |
288 | 288 | |
289 | 289 | return $view; |
@@ -41,7 +41,7 @@ |
||
41 | 41 | * @param \Aimeos\Shop\Base\Context $context Context object |
42 | 42 | * @param \Aimeos\Shop\Base\View $view View object |
43 | 43 | */ |
44 | - public function __construct( \Aimeos\Shop\Base\Aimeos $aimeos, |
|
44 | + public function __construct( \Aimeos\Shop\Base\Aimeos $aimeos, |
|
45 | 45 | \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\View $view ) |
46 | 46 | { |
47 | 47 | $this->context = $context->get(); |
@@ -60,7 +60,7 @@ |
||
60 | 60 | |
61 | 61 | if( Route::current() ) |
62 | 62 | { |
63 | - $site = Route::input( 'site', $site ); |
|
63 | + $site = Route::input( 'site', $site ); |
|
64 | 64 | $currency = Route::input( 'currency', $currency ); |
65 | 65 | $lang = Route::input( 'locale', $lang ); |
66 | 66 | } |