| @@ -100,8 +100,7 @@ discard block | ||
| 100 | 100 | || ( ( $user = \Illuminate\Support\Facades\Auth::user() ) !== null && $user->superuser ) | 
| 101 | 101 |  		) { | 
| 102 | 102 | $helper = new \Aimeos\MW\View\Helper\Access\All( $view ); | 
| 103 | - } | |
| 104 | - else | |
| 103 | + } else | |
| 105 | 104 |  		{ | 
| 106 | 105 | $support = $this->support; | 
| 107 | 106 | |
| @@ -245,8 +244,7 @@ discard block | ||
| 245 | 244 |  		{ | 
| 246 | 245 | $i18n = $this->i18n->get( array( $locale ) ); | 
| 247 | 246 | $translation = $i18n[$locale]; | 
| 248 | - } | |
| 249 | - else | |
| 247 | + } else | |
| 250 | 248 |  		{ | 
| 251 | 249 | $translation = new \Aimeos\MW\Translation\None( 'en' ); | 
| 252 | 250 | } | 
| @@ -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; | 
| @@ -4,7 +4,7 @@ | ||
| 4 | 4 |  { | 
| 5 | 5 | public function testIndexAction() | 
| 6 | 6 |  	{ | 
| 7 | -		$response = $this->action('GET', '\Aimeos\Shop\Controller\AdminController@indexAction'); | |
| 7 | + $response = $this->action( 'GET', '\Aimeos\Shop\Controller\AdminController@indexAction' ); | |
| 8 | 8 | |
| 9 | 9 | $this->assertEquals( '302', $response->getStatusCode() ); | 
| 10 | 10 | } | 
| @@ -4,15 +4,15 @@ | ||
| 4 | 4 |  { | 
| 5 | 5 | public function testGet() | 
| 6 | 6 |  	{ | 
| 7 | -		$aimeos = $this->app->make('\Aimeos\Shop\Base\Aimeos'); | |
| 7 | + $aimeos = $this->app->make( '\Aimeos\Shop\Base\Aimeos' ); | |
| 8 | 8 | |
| 9 | -		$configMock = $this->getMockBuilder('\Illuminate\Config\Repository') | |
| 10 | -			->setMethods( array('get') )->getMock(); | |
| 9 | + $configMock = $this->getMockBuilder( '\Illuminate\Config\Repository' ) | |
| 10 | + ->setMethods( array( 'get' ) )->getMock(); | |
| 11 | 11 | |
| 12 | -		$configMock->expects( $this->exactly(4) )->method('get') | |
| 12 | + $configMock->expects( $this->exactly( 4 ) )->method( 'get' ) | |
| 13 | 13 | ->will( $this->onConsecutiveCalls( true, 'laravel:', array(), array() ) ); | 
| 14 | 14 | |
| 15 | - $object = new \Aimeos\Shop\Base\Config($configMock, $aimeos); | |
| 15 | + $object = new \Aimeos\Shop\Base\Config( $configMock, $aimeos ); | |
| 16 | 16 | |
| 17 | 17 | $this->assertInstanceOf( '\Aimeos\MW\Config\Iface', $object->get() ); | 
| 18 | 18 | } | 
| @@ -5,7 +5,7 @@ | ||
| 5 | 5 |  { | 
| 6 | 6 | public function testCreateNoLocale() | 
| 7 | 7 |  	{ | 
| 8 | -		$config = $this->getMockBuilder('\Illuminate\Config\Repository')->getMock(); | |
| 8 | + $config = $this->getMockBuilder( '\Illuminate\Config\Repository' )->getMock(); | |
| 9 | 9 | |
| 10 | 10 | $i18n = $this->getMockBuilder( '\Aimeos\Shop\Base\I18n' ) | 
| 11 | 11 | ->disableOriginalConstructor() | 
| @@ -4,7 +4,7 @@ | ||
| 4 | 4 |  { | 
| 5 | 5 | public function testGetNoLocale() | 
| 6 | 6 |  	{ | 
| 7 | -		$session = $this->getMockBuilder('\Illuminate\Session\Store')->disableOriginalConstructor()->getMock(); | |
| 7 | + $session = $this->getMockBuilder( '\Illuminate\Session\Store' )->disableOriginalConstructor()->getMock(); | |
| 8 | 8 | $config = $this->app->make( '\Aimeos\Shop\Base\Config' ); | 
| 9 | 9 | $locale = $this->app->make( '\Aimeos\Shop\Base\Locale' ); | 
| 10 | 10 | $i18n = $this->app->make( '\Aimeos\Shop\Base\I18n' ); | 
| @@ -4,7 +4,7 @@ | ||
| 4 | 4 |  { | 
| 5 | 5 | public function testGetBackend() | 
| 6 | 6 |  	{ | 
| 7 | -		$mock = $this->getMockBuilder('\Illuminate\Config\Repository')->getMock(); | |
| 7 | + $mock = $this->getMockBuilder( '\Illuminate\Config\Repository' )->getMock(); | |
| 8 | 8 | $context = $this->app->make( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' ); | 
| 9 | 9 | |
| 10 | 10 | $object = new \Aimeos\Shop\Base\Locale( $mock ); | 
| @@ -4,19 +4,19 @@ | ||
| 4 | 4 |  { | 
| 5 | 5 | public function testGet() | 
| 6 | 6 |  	{ | 
| 7 | -		$aimeos = $this->app->make('\Aimeos\Shop\Base\Aimeos'); | |
| 7 | + $aimeos = $this->app->make( '\Aimeos\Shop\Base\Aimeos' ); | |
| 8 | 8 | |
| 9 | -		$configMock = $this->getMockBuilder('\Illuminate\Config\Repository') | |
| 10 | -			->setMethods( array('get', 'has') )->getMock(); | |
| 9 | + $configMock = $this->getMockBuilder( '\Illuminate\Config\Repository' ) | |
| 10 | + ->setMethods( array( 'get', 'has' ) )->getMock(); | |
| 11 | 11 | |
| 12 | -		$configMock->expects( $this->once() )->method('has') | |
| 13 | - ->will( $this->returnValue(true) ); | |
| 12 | + $configMock->expects( $this->once() )->method( 'has' ) | |
| 13 | + ->will( $this->returnValue( true ) ); | |
| 14 | 14 | |
| 15 | -		$configMock->expects( $this->exactly(3) )->method('get') | |
| 15 | + $configMock->expects( $this->exactly( 3 ) )->method( 'get' ) | |
| 16 | 16 | ->will( $this->onConsecutiveCalls( true, 'laravel:', array() ) ); | 
| 17 | 17 | |
| 18 | - $object = new \Aimeos\Shop\Base\I18n($configMock, $aimeos); | |
| 19 | -		$list = $object->get( array('en') ); | |
| 18 | + $object = new \Aimeos\Shop\Base\I18n( $configMock, $aimeos ); | |
| 19 | + $list = $object->get( array( 'en' ) ); | |
| 20 | 20 | |
| 21 | 21 | $this->assertInstanceOf( '\Aimeos\MW\Translation\Iface', $list['en'] ); | 
| 22 | 22 | } | 
| @@ -4,14 +4,14 @@ | ||
| 4 | 4 |  { | 
| 5 | 5 | public function testGet() | 
| 6 | 6 |  	{ | 
| 7 | -		$object = $this->app->make('\Aimeos\Shop\Base\Aimeos')->get(); | |
| 7 | + $object = $this->app->make( '\Aimeos\Shop\Base\Aimeos' )->get(); | |
| 8 | 8 | $this->assertInstanceOf( '\Aimeos\Bootstrap', $object ); | 
| 9 | 9 | } | 
| 10 | 10 | |
| 11 | 11 | |
| 12 | 12 | public function testGetVersion() | 
| 13 | 13 |  	{ | 
| 14 | -		$object = $this->app->make('\Aimeos\Shop\Base\Aimeos'); | |
| 14 | + $object = $this->app->make( '\Aimeos\Shop\Base\Aimeos' ); | |
| 15 | 15 | $this->assertInternalType( 'string', $object->getVersion() ); | 
| 16 | 16 | } | 
| 17 | 17 | } | 
| @@ -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,24 +34,24 @@ 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}']); | |
| 46 | -		$app['config']->set('shop.routes.default', ['prefix' => '{site}']); | |
| 47 | -		$app['config']->set('shop.routes.confirm', ['prefix' => '{site}']); | |
| 48 | -		$app['config']->set('shop.routes.update', ['prefix' => '{site}']); | |
| 49 | -		$app['config']->set('shop.routes.login', []); | |
| 50 | -		$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}'] ); | |
| 46 | +		$app['config']->set( 'shop.routes.default', ['prefix' => '{site}'] ); | |
| 47 | +		$app['config']->set( 'shop.routes.confirm', ['prefix' => '{site}'] ); | |
| 48 | +		$app['config']->set( 'shop.routes.update', ['prefix' => '{site}'] ); | |
| 49 | + $app['config']->set( 'shop.routes.login', [] ); | |
| 50 | + $app['config']->set( 'shop.extdir', dirname( __DIR__ ) . DIRECTORY_SEPARATOR . 'ext' ); | |
| 51 | 51 | } | 
| 52 | 52 | |
| 53 | 53 | |
| 54 | - protected function getPackageProviders($app) | |
| 54 | + protected function getPackageProviders( $app ) | |
| 55 | 55 |  	{ | 
| 56 | 56 | return ['Aimeos\Shop\ShopServiceProvider']; | 
| 57 | 57 | } |