@@ -13,11 +13,11 @@ |
||
| 13 | 13 | $app['config']->set('database.connections.mysql', [ |
| 14 | 14 | 'driver' => 'mysql', |
| 15 | 15 | 'host' => env('DB_HOST', '127.0.0.1'), |
| 16 | - 'port' => env('DB_PORT', '3306'), |
|
| 16 | + 'port' => env('DB_PORT', '3306'), |
|
| 17 | 17 | 'database' => env('DB_DATABASE', 'laravel'), |
| 18 | 18 | 'username' => env('DB_USERNAME', 'root'), |
| 19 | 19 | 'password' => env('DB_PASSWORD', ''), |
| 20 | - 'unix_socket' => env('DB_SOCKET', ''), |
|
| 20 | + 'unix_socket' => env('DB_SOCKET', ''), |
|
| 21 | 21 | 'collation' => 'utf8_unicode_ci', |
| 22 | 22 | ]); |
| 23 | 23 | |
@@ -2,31 +2,31 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | class AimeosTestAbstract extends Orchestra\Testbench\BrowserKit\TestCase |
| 4 | 4 | { |
| 5 | - protected function getEnvironmentSetUp($app) |
|
| 5 | + protected function getEnvironmentSetUp( $app ) |
|
| 6 | 6 | { |
| 7 | 7 | putenv( 'APP_DEBUG=1' ); |
| 8 | 8 | |
| 9 | - $app['config']->set('app.key', 'SomeRandomStringWith32Characters'); |
|
| 10 | - $app['config']->set('app.cipher', 'AES-256-CBC'); |
|
| 9 | + $app['config']->set( 'app.key', 'SomeRandomStringWith32Characters' ); |
|
| 10 | + $app['config']->set( 'app.cipher', 'AES-256-CBC' ); |
|
| 11 | 11 | |
| 12 | - $app['config']->set('database.default', 'mysql'); |
|
| 13 | - $app['config']->set('database.connections.mysql', [ |
|
| 12 | + $app['config']->set( 'database.default', 'mysql' ); |
|
| 13 | + $app['config']->set( 'database.connections.mysql', [ |
|
| 14 | 14 | 'driver' => 'mysql', |
| 15 | - 'host' => env('DB_HOST', '127.0.0.1'), |
|
| 16 | - 'port' => env('DB_PORT', '3306'), |
|
| 17 | - 'database' => env('DB_DATABASE', 'laravel'), |
|
| 18 | - 'username' => env('DB_USERNAME', 'root'), |
|
| 19 | - 'password' => env('DB_PASSWORD', ''), |
|
| 20 | - 'unix_socket' => env('DB_SOCKET', ''), |
|
| 15 | + 'host' => env( 'DB_HOST', '127.0.0.1' ), |
|
| 16 | + 'port' => env( 'DB_PORT', '3306' ), |
|
| 17 | + 'database' => env( 'DB_DATABASE', 'laravel' ), |
|
| 18 | + 'username' => env( 'DB_USERNAME', 'root' ), |
|
| 19 | + 'password' => env( 'DB_PASSWORD', '' ), |
|
| 20 | + 'unix_socket' => env( 'DB_SOCKET', '' ), |
|
| 21 | 21 | 'collation' => 'utf8_unicode_ci', |
| 22 | - ]); |
|
| 22 | + ] ); |
|
| 23 | 23 | |
| 24 | - $app['config']->set('shop.resource.db', [ |
|
| 24 | + $app['config']->set( 'shop.resource.db', [ |
|
| 25 | 25 | 'adapter' => 'mysql', |
| 26 | - 'host' => env('DB_HOST', 'localhost'), |
|
| 27 | - 'database' => env('DB_DATABASE', 'laravel'), |
|
| 28 | - 'username' => env('DB_USERNAME', 'root'), |
|
| 29 | - 'password' => env('DB_PASSWORD', ''), |
|
| 26 | + 'host' => env( 'DB_HOST', 'localhost' ), |
|
| 27 | + 'database' => env( 'DB_DATABASE', 'laravel' ), |
|
| 28 | + 'username' => env( 'DB_USERNAME', 'root' ), |
|
| 29 | + 'password' => env( 'DB_PASSWORD', '' ), |
|
| 30 | 30 | 'stmt' => ["SET SESSION sort_buffer_size=2097144; SET SESSION sql_mode='ANSI'; SET NAMES 'utf8_bin'"], |
| 31 | 31 | 'opt-persistent' => 0, |
| 32 | 32 | 'limit' => 3, |
@@ -34,23 +34,23 @@ discard block |
||
| 34 | 34 | 'collate' => 'utf8_unicode_ci', |
| 35 | 35 | 'charset' => 'utf8', |
| 36 | 36 | ], |
| 37 | - ]); |
|
| 37 | + ] ); |
|
| 38 | 38 | |
| 39 | - $app['config']->set('shop.authorize', false); |
|
| 40 | - $app['config']->set('shop.disableSites', false); |
|
| 41 | - $app['config']->set('shop.accessControl', false); |
|
| 42 | - $app['config']->set('shop.routes.jqadm', ['prefix' => '{site}/jqadm']); |
|
| 43 | - $app['config']->set('shop.routes.jsonadm', ['prefix' => '{site}/jsonadm']); |
|
| 44 | - $app['config']->set('shop.routes.jsonapi', ['prefix' => '{site}/jsonapi']); |
|
| 45 | - $app['config']->set('shop.routes.account', ['prefix' => '{site}/myaccount']); |
|
| 46 | - $app['config']->set('shop.routes.default', ['prefix' => '{site}/shop']); |
|
| 47 | - $app['config']->set('shop.routes.update', ['prefix' => '{site}']); |
|
| 48 | - $app['config']->set('shop.routes.login', []); |
|
| 49 | - $app['config']->set('shop.extdir', dirname( __DIR__ ) . DIRECTORY_SEPARATOR . 'ext' ); |
|
| 39 | + $app['config']->set( 'shop.authorize', false ); |
|
| 40 | + $app['config']->set( 'shop.disableSites', false ); |
|
| 41 | + $app['config']->set( 'shop.accessControl', false ); |
|
| 42 | + $app['config']->set( 'shop.routes.jqadm', ['prefix' => '{site}/jqadm'] ); |
|
| 43 | + $app['config']->set( 'shop.routes.jsonadm', ['prefix' => '{site}/jsonadm'] ); |
|
| 44 | + $app['config']->set( 'shop.routes.jsonapi', ['prefix' => '{site}/jsonapi'] ); |
|
| 45 | + $app['config']->set( 'shop.routes.account', ['prefix' => '{site}/myaccount'] ); |
|
| 46 | + $app['config']->set( 'shop.routes.default', ['prefix' => '{site}/shop'] ); |
|
| 47 | + $app['config']->set( 'shop.routes.update', ['prefix' => '{site}'] ); |
|
| 48 | + $app['config']->set( 'shop.routes.login', [] ); |
|
| 49 | + $app['config']->set( 'shop.extdir', dirname( __DIR__ ) . DIRECTORY_SEPARATOR . 'ext' ); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | |
| 53 | - protected function getPackageProviders($app) |
|
| 53 | + protected function getPackageProviders( $app ) |
|
| 54 | 54 | { |
| 55 | 55 | return ['Aimeos\Shop\ShopServiceProvider']; |
| 56 | 56 | } |
@@ -4,6 +4,6 @@ |
||
| 4 | 4 | { |
| 5 | 5 | public function testSetupCommand() |
| 6 | 6 | { |
| 7 | - $this->assertEquals(0, $this->artisan('aimeos:cache', array('site' => 'unittest'))); |
|
| 7 | + $this->assertEquals( 0, $this->artisan( 'aimeos:cache', array( 'site' => 'unittest' ) ) ); |
|
| 8 | 8 | } |
| 9 | 9 | } |
@@ -4,6 +4,6 @@ |
||
| 4 | 4 | { |
| 5 | 5 | public function testJobsCommand() |
| 6 | 6 | { |
| 7 | - $this->assertEquals(0, $this->artisan('aimeos:jobs', array('jobs' => 'customer/email/watch', 'site' => 'unittest'))); |
|
| 7 | + $this->assertEquals( 0, $this->artisan( 'aimeos:jobs', array( 'jobs' => 'customer/email/watch', 'site' => 'unittest' ) ) ); |
|
| 8 | 8 | } |
| 9 | 9 | } |
@@ -4,7 +4,7 @@ |
||
| 4 | 4 | { |
| 5 | 5 | public function testSetupCommand() |
| 6 | 6 | { |
| 7 | - $args = array('site' => 'unittest', 'tplsite' => 'unittest', '--option' => 'setup/default/demo:0'); |
|
| 8 | - $this->assertEquals(0, $this->artisan('aimeos:setup', $args)); |
|
| 7 | + $args = array( 'site' => 'unittest', 'tplsite' => 'unittest', '--option' => 'setup/default/demo:0' ); |
|
| 8 | + $this->assertEquals( 0, $this->artisan( 'aimeos:setup', $args ) ); |
|
| 9 | 9 | } |
| 10 | 10 | } |
@@ -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 |