aimeos / aimeos-laravel

src/Aimeos/Shop/Facades/Attribute.php

Indentation +9 added lines, -9 removed lines

@@ -16,13 +16,13 @@
  */
 class Attribute extends \Illuminate\Support\Facades\Facade
 {
-    /**
-     * Returns a new attribute frontend controller object
-     *
-     * @return \Aimeos\Controller\Frontend\Attribute\Iface
-     */
-    protected static function getFacadeAccessor()
-    {
-        return \Aimeos\Controller\Frontend::create( app( 'aimeos.context' )->get(), 'attribute' );
-    }
+	/**
+	 * Returns a new attribute frontend controller object
+	 *
+	 * @return \Aimeos\Controller\Frontend\Attribute\Iface
+	 */
+	protected static function getFacadeAccessor()
+	{
+		return \Aimeos\Controller\Frontend::create( app( 'aimeos.context' )->get(), 'attribute' );
+	}
 }

src/Aimeos/Shop/Controller/CatalogController.php

Spacing +3 added lines, -3 removed lines

@@ -110,9 +110,9 @@
 			$params['aibody'][$name] = Shop::get( $name )->getBody();
 		}
 
-		return Response::view('shop::catalog.suggest', $params)
-			->header('Cache-Control', 'private, max-age=300' )
-			->header('Content-Type', 'application/json');
+		return Response::view( 'shop::catalog.suggest', $params )
+			->header( 'Cache-Control', 'private, max-age=300' )
+			->header( 'Content-Type', 'application/json' );
 	}
 
 

tests/AimeosTestAbstract.php

Indentation +2 added lines, -2 removed lines

@@ -13,11 +13,11 @@
 		$app['config']->set('database.connections.mysql', [
 			'driver' => 'mysql',
 			'host' => env('DB_HOST', '127.0.0.1'),
-            'port' => env('DB_PORT', '3306'),
+			'port' => env('DB_PORT', '3306'),
 			'database' => env('DB_DATABASE', 'laravel'),
 			'username' => env('DB_USERNAME', 'aimeos'),
 			'password' => env('DB_PASSWORD', 'aimeos'),
-            'unix_socket' => env('DB_SOCKET', ''),
+			'unix_socket' => env('DB_SOCKET', ''),
 			'collation' => 'utf8_unicode_ci',
 		]);
 

Spacing +30 added lines, -30 removed lines

@@ -2,31 +2,31 @@ 
 
 class AimeosTestAbstract extends Orchestra\Testbench\BrowserKit\TestCase
 {
-	protected function getEnvironmentSetUp($app)
+	protected function getEnvironmentSetUp( $app )
 	{
 		putenv( 'APP_DEBUG=1' );
 
-		$app['config']->set('app.key', 'SomeRandomStringWith32Characters');
-		$app['config']->set('app.cipher', 'AES-256-CBC');
+		$app['config']->set( 'app.key', 'SomeRandomStringWith32Characters' );
+		$app['config']->set( 'app.cipher', 'AES-256-CBC' );
 
-		$app['config']->set('database.default', 'mysql');
-		$app['config']->set('database.connections.mysql', [
+		$app['config']->set( 'database.default', 'mysql' );
+		$app['config']->set( 'database.connections.mysql', [
 			'driver' => 'mysql',
-			'host' => env('DB_HOST', '127.0.0.1'),
-            'port' => env('DB_PORT', '3306'),
-			'database' => env('DB_DATABASE', 'laravel'),
-			'username' => env('DB_USERNAME', 'aimeos'),
-			'password' => env('DB_PASSWORD', 'aimeos'),
-            'unix_socket' => env('DB_SOCKET', ''),
+			'host' => env( 'DB_HOST', '127.0.0.1' ),
+            'port' => env( 'DB_PORT', '3306' ),
+			'database' => env( 'DB_DATABASE', 'laravel' ),
+			'username' => env( 'DB_USERNAME', 'aimeos' ),
+			'password' => env( 'DB_PASSWORD', 'aimeos' ),
+            'unix_socket' => env( 'DB_SOCKET', '' ),
 			'collation' => 'utf8_unicode_ci',
-		]);
+		] );
 
-		$app['config']->set('shop.resource.db', [
+		$app['config']->set( 'shop.resource.db', [
 			'adapter' => 'mysql',
-			'host' => env('DB_HOST', '127.0.0.1'),
-			'database' => env('DB_DATABASE', 'laravel'),
-			'username' => env('DB_USERNAME', 'aimeos'),
-			'password' => env('DB_PASSWORD', 'aimeos'),
+			'host' => env( 'DB_HOST', '127.0.0.1' ),
+			'database' => env( 'DB_DATABASE', 'laravel' ),
+			'username' => env( 'DB_USERNAME', 'aimeos' ),
+			'password' => env( 'DB_PASSWORD', 'aimeos' ),
 			'stmt' => ["SET SESSION sort_buffer_size=2097144; SET SESSION sql_mode='ANSI'; SET NAMES 'utf8_bin'"],
 			'opt-persistent' => 0,
 			'limit' => 3,
@@ -34,23 +34,23 @@ 
 				'collate' => 'utf8_unicode_ci',
 				'charset' => 'utf8',
 			],
-		]);
+		] );
 
-		$app['config']->set('shop.authorize', false);
-		$app['config']->set('shop.disableSites', false);
-		$app['config']->set('shop.accessControl', false);
-		$app['config']->set('shop.routes.jqadm', ['prefix' => '{site}/jqadm']);
-		$app['config']->set('shop.routes.jsonadm', ['prefix' => '{site}/jsonadm']);
-		$app['config']->set('shop.routes.jsonapi', ['prefix' => '{site}/jsonapi']);
-		$app['config']->set('shop.routes.account', ['prefix' => '{site}/myaccount']);
-		$app['config']->set('shop.routes.default', ['prefix' => '{site}/shop']);
-		$app['config']->set('shop.routes.update', ['prefix' => '{site}']);
-		$app['config']->set('shop.routes.login', []);
-		$app['config']->set('shop.extdir', dirname( __DIR__ ) . DIRECTORY_SEPARATOR . 'ext' );
+		$app['config']->set( 'shop.authorize', false );
+		$app['config']->set( 'shop.disableSites', false );
+		$app['config']->set( 'shop.accessControl', false );
+		$app['config']->set( 'shop.routes.jqadm', ['prefix' => '{site}/jqadm'] );
+		$app['config']->set( 'shop.routes.jsonadm', ['prefix' => '{site}/jsonadm'] );
+		$app['config']->set( 'shop.routes.jsonapi', ['prefix' => '{site}/jsonapi'] );
+		$app['config']->set( 'shop.routes.account', ['prefix' => '{site}/myaccount'] );
+		$app['config']->set( 'shop.routes.default', ['prefix' => '{site}/shop'] );
+		$app['config']->set( 'shop.routes.update', ['prefix' => '{site}'] );
+		$app['config']->set( 'shop.routes.login', [] );
+		$app['config']->set( 'shop.extdir', dirname( __DIR__ ) . DIRECTORY_SEPARATOR . 'ext' );
 	}
 
 
-	protected function getPackageProviders($app)
+	protected function getPackageProviders( $app )
 	{
 		return ['Aimeos\Shop\ShopServiceProvider'];
 	}

src/default.php

Spacing +16 added lines, -16 removed lines

@@ -4,40 +4,40 @@
 
 	'apc_enabled' => false,
 	'apc_prefix' => 'laravel:',
-	'extdir' => base_path('ext'),
+	'extdir' => base_path( 'ext' ),
 	'pcntl_max' => 4,
 	'pcntl_priority' => 19,
 	'uploaddir' => '/',
 
 	'page' => array(
-		'account-index' => array( 'account/profile','account/subscription','account/history','account/favorite','account/watch','basket/mini','catalog/session' ),
-		'basket-index' => array( 'basket/bulk', 'basket/standard','basket/related' ),
+		'account-index' => array( 'account/profile', 'account/subscription', 'account/history', 'account/favorite', 'account/watch', 'basket/mini', 'catalog/session' ),
+		'basket-index' => array( 'basket/bulk', 'basket/standard', 'basket/related' ),
 		'catalog-count' => array( 'catalog/count' ),
-		'catalog-detail' => array( 'basket/mini','catalog/stage','catalog/detail','catalog/session' ),
-		'catalog-list' => array( 'basket/mini','catalog/filter','catalog/lists' ),
+		'catalog-detail' => array( 'basket/mini', 'catalog/stage', 'catalog/detail', 'catalog/session' ),
+		'catalog-list' => array( 'basket/mini', 'catalog/filter', 'catalog/lists' ),
 		'catalog-stock' => array( 'catalog/stock' ),
 		'catalog-suggest' => array( 'catalog/suggest' ),
-		'catalog-tree' => array( 'basket/mini','catalog/filter','catalog/stage','catalog/lists' ),
+		'catalog-tree' => array( 'basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists' ),
 		'checkout-confirm' => array( 'checkout/confirm' ),
 		'checkout-index' => array( 'checkout/standard' ),
-		'checkout-update' => array( 'checkout/update'),
+		'checkout-update' => array( 'checkout/update' ),
 	),
 
 	'resource' => array(
 		'db' => array(
-			'adapter' => config('database.connections.mysql.driver', 'mysql'),
-			'host' => config('database.connections.mysql.host', '127.0.0.1'),
-			'port' => config('database.connections.mysql.port', '3306'),
-			'socket' => config('database.connections.mysql.unix_socket', ''),
-			'database' => config('database.connections.mysql.database', 'forge'),
-			'username' => config('database.connections.mysql.username', 'forge'),
-			'password' => config('database.connections.mysql.password', ''),
+			'adapter' => config( 'database.connections.mysql.driver', 'mysql' ),
+			'host' => config( 'database.connections.mysql.host', '127.0.0.1' ),
+			'port' => config( 'database.connections.mysql.port', '3306' ),
+			'socket' => config( 'database.connections.mysql.unix_socket', '' ),
+			'database' => config( 'database.connections.mysql.database', 'forge' ),
+			'username' => config( 'database.connections.mysql.username', 'forge' ),
+			'password' => config( 'database.connections.mysql.password', '' ),
 			'stmt' => ["SET SESSION sort_buffer_size=2097144; SET NAMES 'utf8mb4'; SET SESSION sql_mode='ANSI'"],
 			'opt-persistent' => 0,
 			'limit' => 3,
 			'defaultTableOptions' => [
-				'charset' => config('database.connections.mysql.charset'),
-				'collate' => config('database.connections.mysql.collation'),
+				'charset' => config( 'database.connections.mysql.charset' ),
+				'collate' => config( 'database.connections.mysql.collation' ),
 			],
 		),
 		'fs' => array(

src/Aimeos/Shop/Base/Support.php

Braces +5 added lines, -2 removed lines

@@ -69,9 +69,12 @@
 		$this->cache[$user->id][$groups] = false;
 		$context = $this->context->get( false );
 
-		try {
+		try
+		{
 			$site = \Aimeos\MShop::create( $context, 'locale/site' )->getItem( $user->siteid )->getCode();
-		} catch( \Exception $e ) {
+		}
+		catch( \Exception $e )
+		{
 			$site = ( Route::current() ? Route::input( 'site', Request::get( 'site', 'default' ) ) : 'default' );
 		}
 

tests/Controller/CatalogControllerTest.php

Spacing +24 added lines, -24 removed lines

@@ -4,72 +4,72 @@
 {
 	public function testCountAction()
 	{
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
 
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\CatalogController@countAction', ['site' => 'unittest']);
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\CatalogController@countAction', ['site' => 'unittest'] );
 
 		$this->assertResponseOk();
-		$this->assertContains('.catalog-filter-count', $response->getContent());
-		$this->assertContains('.catalog-filter-attribute', $response->getContent());
+		$this->assertContains( '.catalog-filter-count', $response->getContent() );
+		$this->assertContains( '.catalog-filter-attribute', $response->getContent() );
 	}
 
 
 	public function testDetailAction()
 	{
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
 
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\CatalogController@detailAction', ['site' => 'unittest', 'd_name' => 'Cafe_Noire_Cappuccino']);
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\CatalogController@detailAction', ['site' => 'unittest', 'd_name' => 'Cafe_Noire_Cappuccino'] );
 
 		$this->assertResponseOk();
-		$this->assertContains('<section class="aimeos catalog-stage"', $response->getContent());
-		$this->assertContains('<section class="aimeos catalog-detail"', $response->getContent());
-		$this->assertContains('<section class="aimeos catalog-session"', $response->getContent());
+		$this->assertContains( '<section class="aimeos catalog-stage"', $response->getContent() );
+		$this->assertContains( '<section class="aimeos catalog-detail"', $response->getContent() );
+		$this->assertContains( '<section class="aimeos catalog-session"', $response->getContent() );
 	}
 
 
 	public function testListAction()
 	{
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
 
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\CatalogController@listAction', ['site' => 'unittest']);
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\CatalogController@listAction', ['site' => 'unittest'] );
 
 		$this->assertResponseOk();
-		$this->assertContains('<section class="aimeos catalog-filter"', $response->getContent());
-		$this->assertContains('<section class="aimeos catalog-list"', $response->getContent());
+		$this->assertContains( '<section class="aimeos catalog-filter"', $response->getContent() );
+		$this->assertContains( '<section class="aimeos catalog-list"', $response->getContent() );
 	}
 
 
 	public function testStockAction()
 	{
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
 
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\CatalogController@stockAction', ['site' => 'unittest']);
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\CatalogController@stockAction', ['site' => 'unittest'] );
 
 		$this->assertResponseOk();
-		$this->assertContains('.aimeos .product .stock', $response->getContent());
+		$this->assertContains( '.aimeos .product .stock', $response->getContent() );
 	}
 
 
 	public function testSuggestAction()
 	{
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
 
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\CatalogController@suggestAction', ['site' => 'unittest'], ['f_search' => 'Cafe']);
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\CatalogController@suggestAction', ['site' => 'unittest'], ['f_search' => 'Cafe'] );
 
 		$this->assertResponseOk();
-		$this->assertRegexp('/[{.*}]/', $response->getContent());
+		$this->assertRegexp( '/[{.*}]/', $response->getContent() );
 	}
 
 
 	public function testTreeAction()
 	{
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
 
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\CatalogController@treeAction', ['site' => 'unittest', 'f_catid' => 1, 'f_name' => 'test']);
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\CatalogController@treeAction', ['site' => 'unittest', 'f_catid' => 1, 'f_name' => 'test'] );
 
 		$this->assertResponseOk();
-		$this->assertContains('<section class="aimeos catalog-filter', $response->getContent());
-		$this->assertContains('<section class="aimeos catalog-stage', $response->getContent());
-		$this->assertContains('<section class="aimeos catalog-list', $response->getContent());
+		$this->assertContains( '<section class="aimeos catalog-filter', $response->getContent() );
+		$this->assertContains( '<section class="aimeos catalog-stage', $response->getContent() );
+		$this->assertContains( '<section class="aimeos catalog-list', $response->getContent() );
 	}
 }
\ No newline at end of file

src/routes.php

Spacing +56 added lines, -56 removed lines

@@ -1,253 +1,253 @@
 <?php
 
-if(($conf = config('shop.routes.admin', ['prefix' => 'admin', 'middleware' => ['web']])) !== false ) {
+if( ( $conf = config( 'shop.routes.admin', ['prefix' => 'admin', 'middleware' => ['web']] ) ) !== false ) {
 
-	Route::group($conf, function() {
+	Route::group( $conf, function() {
 
 		Route::match( array( 'GET' ), '', array(
 			'as' => 'aimeos_shop_admin',
 			'uses' => 'Aimeos\Shop\Controller\AdminController@indexAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] );
 
 	});
 }
 
 
-if(($conf = config('shop.routes.jqadm', ['prefix' => 'admin/{site}/jqadm', 'middleware' => ['web', 'auth']])) !== false ) {
+if( ( $conf = config( 'shop.routes.jqadm', ['prefix' => 'admin/{site}/jqadm', 'middleware' => ['web', 'auth']] ) ) !== false ) {
 
-	Route::group($conf, function() {
+	Route::group( $conf, function() {
 
 		Route::match( array( 'GET' ), 'file/{type}', array(
 			'as' => 'aimeos_shop_jqadm_file',
 			'uses' => 'Aimeos\Shop\Controller\JqadmController@fileAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] );
 
 		Route::match( array( 'GET', 'POST' ), 'copy/{resource}/{id}', array(
 			'as' => 'aimeos_shop_jqadm_copy',
 			'uses' => 'Aimeos\Shop\Controller\JqadmController@copyAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]+' ) );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]+' ) );
 
 		Route::match( array( 'GET', 'POST' ), 'create/{resource}', array(
 			'as' => 'aimeos_shop_jqadm_create',
 			'uses' => 'Aimeos\Shop\Controller\JqadmController@createAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]+' ) );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]+' ) );
 
 		Route::match( array( 'GET', 'POST' ), 'delete/{resource}/{id?}', array(
 			'as' => 'aimeos_shop_jqadm_delete',
 			'uses' => 'Aimeos\Shop\Controller\JqadmController@deleteAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]+' ) );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]+' ) );
 
 		Route::match( array( 'GET', 'POST' ), 'export/{resource}', array(
 			'as' => 'aimeos_shop_jqadm_export',
 			'uses' => 'Aimeos\Shop\Controller\JqadmController@exportAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]+' ) );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]+' ) );
 
 		Route::match( array( 'GET' ), 'get/{resource}/{id}', array(
 			'as' => 'aimeos_shop_jqadm_get',
 			'uses' => 'Aimeos\Shop\Controller\JqadmController@getAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]+' ) );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]+' ) );
 
 		Route::match( array( 'POST' ), 'save/{resource}', array(
 			'as' => 'aimeos_shop_jqadm_save',
 			'uses' => 'Aimeos\Shop\Controller\JqadmController@saveAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]+' ) );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]+' ) );
 
 		Route::match( array( 'GET', 'POST' ), 'search/{resource}', array(
 			'as' => 'aimeos_shop_jqadm_search',
 			'uses' => 'Aimeos\Shop\Controller\JqadmController@searchAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]+' ) );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]+' ) );
 
 	});
 }
 
 
-if(($conf = config('shop.routes.jsonadm', ['prefix' => 'admin/{site}/jsonadm', 'middleware' => ['web', 'auth']])) !== false ) {
+if( ( $conf = config( 'shop.routes.jsonadm', ['prefix' => 'admin/{site}/jsonadm', 'middleware' => ['web', 'auth']] ) ) !== false ) {
 
-	Route::group($conf, function() {
+	Route::group( $conf, function() {
 
 		Route::match( array( 'DELETE' ), '{resource}/{id?}', array(
 			'as' => 'aimeos_shop_jsonadm_delete',
 			'uses' => 'Aimeos\Shop\Controller\JsonadmController@deleteAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]+' ) );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]+' ) );
 
 		Route::match( array( 'GET' ), '{resource}/{id?}', array(
 			'as' => 'aimeos_shop_jsonadm_get',
 			'uses' => 'Aimeos\Shop\Controller\JsonadmController@getAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]+' ) );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]+' ) );
 
 		Route::match( array( 'PATCH' ), '{resource}/{id?}', array(
 			'as' => 'aimeos_shop_jsonadm_patch',
 			'uses' => 'Aimeos\Shop\Controller\JsonadmController@patchAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]+' ) );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]+' ) );
 
 		Route::match( array( 'POST' ), '{resource}/{id?}', array(
 			'as' => 'aimeos_shop_jsonadm_post',
 			'uses' => 'Aimeos\Shop\Controller\JsonadmController@postAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]+' ) );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]+' ) );
 
 		Route::match( array( 'PUT' ), '{resource}/{id?}', array(
 			'as' => 'aimeos_shop_jsonadm_put',
 			'uses' => 'Aimeos\Shop\Controller\JsonadmController@putAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]+' ) );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]+' ) );
 
 		Route::match( array( 'OPTIONS' ), '{resource?}', array(
 			'as' => 'aimeos_shop_jsonadm_options',
 			'uses' => 'Aimeos\Shop\Controller\JsonadmController@optionsAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]*' ) );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] )->where( array( 'resource' => '[a-z\/]*' ) );
 
 	});
 }
 
 
-if(($conf = config('shop.routes.jsonapi', ['prefix' => 'jsonapi', 'middleware' => ['web', 'api']])) !== false ) {
+if( ( $conf = config( 'shop.routes.jsonapi', ['prefix' => 'jsonapi', 'middleware' => ['web', 'api']] ) ) !== false ) {
 
-	Route::group($conf, function() {
+	Route::group( $conf, function() {
 
 		Route::match( array( 'DELETE' ), '{resource}', array(
 			'as' => 'aimeos_shop_jsonapi_delete',
 			'uses' => 'Aimeos\Shop\Controller\JsonapiController@deleteAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] );
 
 		Route::match( array( 'GET' ), '{resource}', array(
 			'as' => 'aimeos_shop_jsonapi_get',
 			'uses' => 'Aimeos\Shop\Controller\JsonapiController@getAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] );
 
 		Route::match( array( 'PATCH' ), '{resource}', array(
 			'as' => 'aimeos_shop_jsonapi_patch',
 			'uses' => 'Aimeos\Shop\Controller\JsonapiController@patchAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] );
 
 		Route::match( array( 'POST' ), '{resource}', array(
 			'as' => 'aimeos_shop_jsonapi_post',
 			'uses' => 'Aimeos\Shop\Controller\JsonapiController@postAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] );
 
 		Route::match( array( 'PUT' ), '{resource}', array(
 			'as' => 'aimeos_shop_jsonapi_put',
 			'uses' => 'Aimeos\Shop\Controller\JsonapiController@putAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] );
 
 		Route::match( array( 'OPTIONS' ), '{resource?}', array(
 			'as' => 'aimeos_shop_jsonapi_options',
 			'uses' => 'Aimeos\Shop\Controller\JsonapiController@optionsAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] );
 
 	});
 }
 
 
-if(($conf = config('shop.routes.update', [])) !== false ) {
+if( ( $conf = config( 'shop.routes.update', [] ) ) !== false ) {
 
-	Route::group($conf, function() {
+	Route::group( $conf, function() {
 
 		Route::match( array( 'GET', 'POST' ), 'update', array(
 			'as' => 'aimeos_shop_update',
 			'uses' => 'Aimeos\Shop\Controller\CheckoutController@updateAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] );
 
 	});
 }
 
 
-if(($conf = config('shop.routes.account', ['prefix' => 'myaccount', 'middleware' => ['web', 'auth']])) !== false ) {
+if( ( $conf = config( 'shop.routes.account', ['prefix' => 'myaccount', 'middleware' => ['web', 'auth']] ) ) !== false ) {
 
-	Route::group($conf, function() {
+	Route::group( $conf, function() {
 
 		Route::match( array( 'GET', 'POST' ), 'favorite/{fav_action?}/{fav_id?}/{d_name?}/{d_pos?}', array(
 			'as' => 'aimeos_shop_account_favorite',
 			'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] );
 
 		Route::match( array( 'GET', 'POST' ), 'watch/{wat_action?}/{wat_id?}/{d_name?}/{d_pos?}', array(
 			'as' => 'aimeos_shop_account_watch',
 			'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] );
 
 		Route::match( array( 'GET', 'POST' ), 'download/{dl_id}', array(
 			'as' => 'aimeos_shop_account_download',
 			'uses' => 'Aimeos\Shop\Controller\AccountController@downloadAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] );
 
 		Route::match( array( 'GET', 'POST' ), '', array(
 			'as' => 'aimeos_shop_account',
 			'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] );
 
 	});
 }
 
 
-if(($conf = config('shop.routes.default', ['prefix' => 'shop', 'middleware' => ['web']])) !== false ) {
+if( ( $conf = config( 'shop.routes.default', ['prefix' => 'shop', 'middleware' => ['web']] ) ) !== false ) {
 
-	Route::group($conf, function() {
+	Route::group( $conf, function() {
 
 		Route::match( array( 'GET', 'POST' ), 'count', array(
 			'as' => 'aimeos_shop_count',
 			'uses' => 'Aimeos\Shop\Controller\CatalogController@countAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] );
 
 		Route::match( array( 'GET', 'POST' ), 'suggest', array(
 			'as' => 'aimeos_shop_suggest',
 			'uses' => 'Aimeos\Shop\Controller\CatalogController@suggestAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] );
 
 		Route::match( array( 'GET', 'POST' ), 'stock', array(
 			'as' => 'aimeos_shop_stock',
 			'uses' => 'Aimeos\Shop\Controller\CatalogController@stockAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] );
 
 		Route::match( array( 'GET', 'POST' ), 'basket', array(
 			'as' => 'aimeos_shop_basket',
 			'uses' => 'Aimeos\Shop\Controller\BasketController@indexAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] );
 
 		Route::match( array( 'GET', 'POST' ), 'checkout/{c_step?}', array(
 			'as' => 'aimeos_shop_checkout',
 			'uses' => 'Aimeos\Shop\Controller\CheckoutController@indexAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] );
 
 		Route::match( array( 'GET', 'POST' ), 'confirm/{code?}', array(
 			'as' => 'aimeos_shop_confirm',
 			'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] );
 
 		Route::match( array( 'GET', 'POST' ), 'pin/{pin_action}/{pin_id}/{d_name}', array(
 			'as' => 'aimeos_shop_session_pinned',
 			'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] );
 
 		Route::match( array( 'GET', 'POST' ), '{f_name}~{f_catid}', array(
 			'as' => 'aimeos_shop_tree',
 			'uses' => 'Aimeos\Shop\Controller\CatalogController@treeAction'
-		))->where( ['site' => '[a-z0-9\.\-]+', 'f_name' => '[^~]+'] );
+		) )->where( ['site' => '[a-z0-9\.\-]+', 'f_name' => '[^~]+'] );
 
 		Route::match( array( 'GET', 'POST' ), '{d_name}/{d_pos?}/{d_prodid?}', array(
 			'as' => 'aimeos_shop_detail',
 			'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
-		))->where( ['site' => '[a-z0-9\.\-]+', 'd_pos' => '[0-9]*'] );
+		) )->where( ['site' => '[a-z0-9\.\-]+', 'd_pos' => '[0-9]*'] );
 
 		Route::match( array( 'GET', 'POST' ), '', array(
 			'as' => 'aimeos_shop_list',
 			'uses' => 'Aimeos\Shop\Controller\CatalogController@listAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] );
 
 	});
 }
 
 
-if(($conf = config('shop.routes.legal', [])) !== false ) {
+if( ( $conf = config( 'shop.routes.legal', [] ) ) !== false ) {
 
-	Route::group($conf, function() {
+	Route::group( $conf, function() {
 
-		Route::get('terms', array(
+		Route::get( 'terms', array(
 			'as' => 'aimeos_shop_terms',
 			'uses' => 'Aimeos\Shop\Controller\PageController@termsAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] );
 
-		Route::get('privacy', array(
+		Route::get( 'privacy', array(
 			'as' => 'aimeos_shop_privacy',
 			'uses' => 'Aimeos\Shop\Controller\PageController@privacyAction'
-		))->where( ['site' => '[a-z0-9\.\-]+'] );
+		) )->where( ['site' => '[a-z0-9\.\-]+'] );
 	});
 }

src/Aimeos/Shop/Command/AccountCommand.php

Braces +5 added lines, -2 removed lines

@@ -68,9 +68,12 @@
 
 		$manager = \Aimeos\MShop::create( $context, 'customer' );
 
-		try {
+		try
+		{
 			$item = $manager->findItem( $email );
-		} catch( \Aimeos\MShop\Exception $e ) {
+		}
+		catch( \Aimeos\MShop\Exception $e )
+		{
 			$item = $manager->createItem();
 		}
 

tests/Controller/JqadmControllerTest.php

Spacing +22 added lines, -22 removed lines

@@ -4,32 +4,32 @@ 
 {
 	public function testFileActionCss()
 	{
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
 
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\JqadmController@fileAction', ['site' => 'unittest', 'type' => 'css']);
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\JqadmController@fileAction', ['site' => 'unittest', 'type' => 'css'] );
 
 		$this->assertResponseOk();
-		$this->assertContains('.aimeos', $response->getContent());
+		$this->assertContains( '.aimeos', $response->getContent() );
 	}
 
 
 	public function testFileActionJs()
 	{
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
 
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\JqadmController@fileAction', ['site' => 'unittest', 'type' => 'js']);
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\JqadmController@fileAction', ['site' => 'unittest', 'type' => 'js'] );
 
 		$this->assertResponseOk();
-		$this->assertContains('Aimeos = {', $response->getContent());
+		$this->assertContains( 'Aimeos = {', $response->getContent() );
 	}
 
 
 	public function testCopyAction()
 	{
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
 
 		$params = ['site' => 'unittest', 'resource' => 'product', 'id' => '0'];
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\JqadmController@copyAction', $params);
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\JqadmController@copyAction', $params );
 
 		$this->assertEquals( 200, $response->getStatusCode() );
 		$this->assertContains( 'item-product', $response->getContent() );
@@ -38,10 +38,10 @@ 
 
 	public function testCreateAction()
 	{
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
 
 		$params = ['site' => 'unittest', 'resource' => 'product'];
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\JqadmController@createAction', $params);
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\JqadmController@createAction', $params );
 
 		$this->assertEquals( 200, $response->getStatusCode() );
 		$this->assertContains( 'item-product', $response->getContent() );
@@ -50,10 +50,10 @@ 
 
 	public function testDeleteAction()
 	{
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
 
 		$params = ['site' => 'unittest', 'resource' => 'product', 'id' => '0'];
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\JqadmController@deleteAction', $params);
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\JqadmController@deleteAction', $params );
 
 		$this->assertEquals( 302, $response->getStatusCode() );
 	}
@@ -61,10 +61,10 @@ 
 
 	public function testExportAction()
 	{
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
 
 		$params = ['site' => 'unittest', 'resource' => 'order'];
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\JqadmController@exportAction', $params);
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\JqadmController@exportAction', $params );
 
 		$this->assertEquals( 200, $response->getStatusCode() );
 		$this->assertContains( 'list-items', $response->getContent() );
@@ -73,10 +73,10 @@ 
 
 	public function testGetAction()
 	{
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
 
 		$params = ['site' => 'unittest', 'resource' => 'product', 'id' => '0'];
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\JqadmController@getAction', $params);
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\JqadmController@getAction', $params );
 
 		$this->assertEquals( 200, $response->getStatusCode() );
 		$this->assertContains( 'item-product', $response->getContent() );
@@ -85,10 +85,10 @@ 
 
 	public function testSaveAction()
 	{
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
 
 		$params = ['site' => 'unittest', 'resource' => 'product', 'id' => '0'];
-		$response = $this->action('POST', '\Aimeos\Shop\Controller\JqadmController@saveAction', $params);
+		$response = $this->action( 'POST', '\Aimeos\Shop\Controller\JqadmController@saveAction', $params );
 
 		$this->assertEquals( 200, $response->getStatusCode() );
 		$this->assertContains( 'item-product', $response->getContent() );
@@ -97,10 +97,10 @@ 
 
 	public function testSearchAction()
 	{
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
 
 		$params = ['site' => 'unittest', 'resource' => 'product'];
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\JqadmController@searchAction', $params);
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\JqadmController@searchAction', $params );
 
 		$this->assertEquals( 200, $response->getStatusCode() );
 		$this->assertContains( 'list-items', $response->getContent() );
@@ -109,10 +109,10 @@ 
 
 	public function testSearchActionSite()
 	{
-		View::addLocation(dirname(__DIR__).'/fixtures/views');
+		View::addLocation( dirname( __DIR__ ) . '/fixtures/views' );
 
 		$params = ['site' => 'invalid', 'resource' => 'product'];
-		$response = $this->action('GET', '\Aimeos\Shop\Controller\JqadmController@searchAction', $params);
+		$response = $this->action( 'GET', '\Aimeos\Shop\Controller\JqadmController@searchAction', $params );
 
 		$this->assertEquals( 500, $response->getStatusCode() );
 	}