aimeos / aimeos-laravel

src/Aimeos/Shop/Controller/AdminController.php

Spacing +79 added lines, -79 removed lines

@@ -28,50 +28,50 @@ 
 	 */
 	public function indexAction()
 	{
-		$site = \Input::get( 'site', 'default' );
-		$lang = \Input::get( 'lang', 'en' );
+		$site = \Input::get('site', 'default');
+		$lang = \Input::get('lang', 'en');
 
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
-		$cntlPaths = $aimeos->getCustomPaths( 'controller/extjs' );
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
+		$cntlPaths = $aimeos->getCustomPaths('controller/extjs');
 
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false );
-		$context = $this->setLocale( $context, $site, $lang );
+		$context = app('\Aimeos\Shop\Base\Context')->get(false);
+		$context = $this->setLocale($context, $site, $lang);
 
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
 		$cssFiles = array();
 
-		foreach( $aimeos->getCustomPaths( 'client/extjs' ) as $base => $paths )
+		foreach ($aimeos->getCustomPaths('client/extjs') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
 				$jsbAbsPath = $base . '/' . $path;
 
-				if( !is_file( $jsbAbsPath ) ) {
-					throw new \Exception( sprintf( 'JSB2 file "%1$s" not found', $jsbAbsPath ) );
+				if (!is_file($jsbAbsPath)) {
+					throw new \Exception(sprintf('JSB2 file "%1$s" not found', $jsbAbsPath));
 				}
 
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $path ) );
-				$cssFiles = array_merge( $cssFiles, $jsb2->getUrls( 'css' ) );
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($path));
+				$cssFiles = array_merge($cssFiles, $jsb2->getUrls('css'));
 			}
 		}
 
-		$params = array( 'site' => '{site}', 'lang' => '{lang}', 'tab' => '{tab}' );
-		$adminUrl = route( 'aimeos_shop_admin', $params );
-		$jsonUrl = route( 'aimeos_shop_admin_json', array( '_token' => csrf_token() ) );
+		$params = array('site' => '{site}', 'lang' => '{lang}', 'tab' => '{tab}');
+		$adminUrl = route('aimeos_shop_admin', $params);
+		$jsonUrl = route('aimeos_shop_admin_json', array('_token' => csrf_token()));
 
 		$vars = array(
 			'lang' => $lang,
 			'cssFiles' => $cssFiles,
-			'languages' => $this->getJsonLanguages( $context),
-			'config' => $this->getJsonClientConfig( $context ),
-			'site' => $this->getJsonSiteItem( $context, \Input::get( 'site', 'default' ) ),
-			'i18nContent' => $this->getJsonClientI18n( $aimeos->getI18nPaths(), $lang ),
+			'languages' => $this->getJsonLanguages($context),
+			'config' => $this->getJsonClientConfig($context),
+			'site' => $this->getJsonSiteItem($context, \Input::get('site', 'default')),
+			'i18nContent' => $this->getJsonClientI18n($aimeos->getI18nPaths(), $lang),
 			'searchSchemas' => $controller->getJsonSearchSchemas(),
 			'itemSchemas' => $controller->getJsonItemSchemas(),
-			'smd' => $controller->getJsonSmd( $jsonUrl ),
-			'urlTemplate' => urldecode( $adminUrl ),
-			'uploaddir' => \Config::get( 'shop::uploaddir' ),
-			'activeTab' => \Input::get( 'tab', 0 ),
+			'smd' => $controller->getJsonSmd($jsonUrl),
+			'urlTemplate' => urldecode($adminUrl),
+			'uploaddir' => \Config::get('shop::uploaddir'),
+			'activeTab' => \Input::get('tab', 0),
 			'version' => $this->getVersion(),
 		);
 
@@ -86,16 +86,16 @@ 
 	 */
 	public function doAction()
 	{
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
-		$cntlPaths = $aimeos->getCustomPaths( 'controller/extjs' );
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
+		$cntlPaths = $aimeos->getCustomPaths('controller/extjs');
 
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false );
-		$context = $this->setLocale( $context );
+		$context = app('\Aimeos\Shop\Base\Context')->get(false);
+		$context = $this->setLocale($context);
 
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
 
-		$response = $controller->process( \Input::instance()->request->all(), 'php://input' );
-		return \View::make('shop::admin.do', array( 'output' => $response ));
+		$response = $controller->process(\Input::instance()->request->all(), 'php://input');
+		return \View::make('shop::admin.do', array('output' => $response));
 	}
 
 
@@ -108,26 +108,26 @@ 
 	{
 		$contents = '';
 		$jsFiles = array();
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
 
-		foreach( $aimeos->getCustomPaths( 'client/extjs' ) as $base => $paths )
+		foreach ($aimeos->getCustomPaths('client/extjs') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
 				$jsbAbsPath = $base . '/' . $path;
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
-				$jsFiles = array_merge( $jsFiles, $jsb2->getUrls( 'js', '' ) );
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
+				$jsFiles = array_merge($jsFiles, $jsb2->getUrls('js', ''));
 			}
 		}
 
-		foreach( $jsFiles as $file )
+		foreach ($jsFiles as $file)
 		{
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
+			if (($content = file_get_contents($file)) !== false) {
 				$contents .= $content;
 			}
 		}
 
-		return response( $contents )->header( 'Content-Type', 'application/javascript' );
+		return response($contents)->header('Content-Type', 'application/javascript');
 	}
 
 
@@ -137,30 +137,30 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return array List of language IDs with labels
 	 */
-	protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function getJsonLanguages(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$paths = app( '\Aimeos\Shop\Base\Aimeos' )->get()->getI18nPaths();
+		$paths = app('\Aimeos\Shop\Base\Aimeos')->get()->getI18nPaths();
 		$langs = array();
 
-		if( !isset( $paths['client/extjs'] ) ) {
-			return json_encode( array() );
+		if (!isset($paths['client/extjs'])) {
+			return json_encode(array());
 		}
 
-		foreach( $paths['client/extjs'] as $path )
+		foreach ($paths['client/extjs'] as $path)
 		{
-			$iter = new \DirectoryIterator( $path );
+			$iter = new \DirectoryIterator($path);
 
-			foreach( $iter as $file )
+			foreach ($iter as $file)
 			{
 				$name = $file->getFilename();
 
-				if( preg_match('/^[a-z]{2,3}(_[A-Z]{2})?$/', $name ) ) {
+				if (preg_match('/^[a-z]{2,3}(_[A-Z]{2})?$/', $name)) {
 					$langs[$name] = null;
 				}
 			}
 		}
 
-		return json_encode( $this->getLanguages( $context, array_keys( $langs ) ) );
+		return json_encode($this->getLanguages($context, array_keys($langs)));
 	}
 
 
@@ -170,10 +170,10 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item object
 	 * @return string JSON encoded configuration object
 	 */
-	protected function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function getJsonClientConfig(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$config = $context->getConfig()->get( 'client/extjs', array() );
-		return json_encode( array( 'client' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT );
+		$config = $context->getConfig()->get('client/extjs', array());
+		return json_encode(array('client' => array('extjs' => $config)), JSON_FORCE_OBJECT);
 	}
 
 
@@ -184,16 +184,16 @@ 
 	 * @param string $lang ISO language code like "en" or "en_GB"
 	 * @return string JSON encoded translation object
 	 */
-	protected function getJsonClientI18n( array $i18nPaths, $lang )
+	protected function getJsonClientI18n(array $i18nPaths, $lang)
 	{
-		$i18n = new \Aimeos\MW\Translation\Zend2( $i18nPaths, 'gettext', $lang, array( 'disableNotices' => true ) );
+		$i18n = new \Aimeos\MW\Translation\Zend2($i18nPaths, 'gettext', $lang, array('disableNotices' => true));
 
 		$content = array(
-			'client/extjs' => $i18n->getAll( 'client/extjs' ),
-			'client/extjs/ext' => $i18n->getAll( 'client/extjs/ext' ),
+			'client/extjs' => $i18n->getAll('client/extjs'),
+			'client/extjs/ext' => $i18n->getAll('client/extjs/ext'),
 		);
 
-		return json_encode( $content, JSON_FORCE_OBJECT );
+		return json_encode($content, JSON_FORCE_OBJECT);
 	}
 
 
@@ -205,19 +205,19 @@ 
 	 * @return string JSON encoded site item object
 	 * @throws Exception If no site item was found for the code
 	 */
-	protected function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site )
+	protected function getJsonSiteItem(\Aimeos\MShop\Context\Item\Iface $context, $site)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');
 
 		$criteria = $manager->createSearch();
-		$criteria->setConditions( $criteria->compare( '==', 'locale.site.code', $site ) );
-		$items = $manager->searchItems( $criteria );
+		$criteria->setConditions($criteria->compare('==', 'locale.site.code', $site));
+		$items = $manager->searchItems($criteria);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( sprintf( 'No site found for code "%1$s"', $site ) );
+		if (($item = reset($items)) === false) {
+			throw new \Exception(sprintf('No site found for code "%1$s"', $site));
 		}
 
-		return json_encode( $item->toArray() );
+		return json_encode($item->toArray());
 	}
 
 
@@ -228,18 +228,18 @@ 
 	 * @param array $langIds List of language IDs
 	 * @return array List of associative lists with "id" and "label" as keys
 	 */
-	protected function getLanguages( \Aimeos\MShop\Context\Item\Iface $context, array $langIds )
+	protected function getLanguages(\Aimeos\MShop\Context\Item\Iface $context, array $langIds)
 	{
-		$languageManager = \Aimeos\MShop\Factory::createManager( $context, 'locale/language' );
+		$languageManager = \Aimeos\MShop\Factory::createManager($context, 'locale/language');
 		$result = array();
 
 		$search = $languageManager->createSearch();
-		$search->setConditions( $search->compare('==', 'locale.language.id', $langIds ) );
-		$search->setSortations( array( $search->sort( '-', 'locale.language.status' ), $search->sort( '+', 'locale.language.label' ) ) );
-		$langItems = $languageManager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'locale.language.id', $langIds));
+		$search->setSortations(array($search->sort('-', 'locale.language.status'), $search->sort('+', 'locale.language.label')));
+		$langItems = $languageManager->searchItems($search);
 
-		foreach( $langItems as $id => $item ) {
-			$result[] = array( 'id' => $id, 'label' => $item->getLabel() );
+		foreach ($langItems as $id => $item) {
+			$result[] = array('id' => $id, 'label' => $item->getLabel());
 		}
 
 		return $result;
@@ -253,12 +253,12 @@ 
 	 */
 	protected function getVersion()
 	{
-		if( ( $content = @file_get_contents( base_path( 'composer.lock' ) ) ) !== false
-			&& ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] )
+		if (($content = @file_get_contents(base_path('composer.lock'))) !== false
+			&& ($content = json_decode($content, true)) !== null && isset($content['packages'])
 		) {
-			foreach( (array) $content['packages'] as $item )
+			foreach ((array) $content['packages'] as $item)
 			{
-				if( $item['name'] === 'aimeos/aimeos-laravel' ) {
+				if ($item['name'] === 'aimeos/aimeos-laravel') {
 					return $item['version'];
 				}
 			}
@@ -276,17 +276,17 @@ 
 	 * @param string $locale ISO language code, e.g. "en" or "en_GB"
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null )
+	protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null)
 	{
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
 
 		try {
-			$localeItem = $localeManager->bootstrap( $sitecode, $locale, '', false );
-		} catch( \Aimeos\MShop\Locale\Exception $e ) {
+			$localeItem = $localeManager->bootstrap($sitecode, $locale, '', false);
+		} catch (\Aimeos\MShop\Locale\Exception $e) {
 			$localeItem = $localeManager->createItem();
 		}
 
-		$context->setLocale( $localeItem );
+		$context->setLocale($localeItem);
 
 		return $context;
 	}

src/Aimeos/Shop/Controller/BasketController.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	 */
 	public function indexAction()
 	{
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'basket-index' );
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('basket-index');
 		return \View::make('shop::basket.index', $params);
 	}
 }
\ No newline at end of file

src/Aimeos/Shop/Controller/CatalogController.php

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function countAction()
 	{
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'catalog-count' );
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('catalog-count');
 		$contents = \View::make('shop::catalog.count', $params);
 
 		$response = \Response::make($contents, 200);
@@ -45,7 +45,7 @@ 
 	 */
 	public function detailAction()
 	{
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-detail' );
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-detail');
 		return \View::make('shop::catalog.detail', $params);
 	}
 
@@ -57,7 +57,7 @@ 
 	 */
 	public function listAction()
 	{
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-list' );
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-list');
 		return \View::make('shop::catalog.list', $params);
 	}
 
@@ -69,7 +69,7 @@ 
 	 */
 	public function stockAction()
 	{
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-stock' );
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-stock');
 		$contents = \View::make('shop::catalog.stock', $params);
 
 		$response = \Response::make($contents, 200);
@@ -86,7 +86,7 @@ 
 	 */
 	public function suggestAction()
 	{
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-suggest' );
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-suggest');
 		$contents = \View::make('shop::catalog.suggest', $params);
 
 		$response = \Response::make($contents, 200);

src/Aimeos/Shop/Controller/CheckoutController.php

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function confirmAction()
 	{
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-confirm' );
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-confirm');
 		return \View::make('shop::checkout.confirm', $params);
 	}
 
@@ -40,7 +40,7 @@ 
 	 */
 	public function indexAction()
 	{
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-index' );
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-index');
 		return \View::make('shop::checkout.index', $params);
 	}
 
@@ -52,7 +52,7 @@ 
 	 */
 	public function updateAction()
 	{
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-update' );
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-update');
 		return \View::make('shop::checkout.update', $params);
 	}
 }
\ No newline at end of file

src/Aimeos/Shop/Controller/JsonadmController.php

Spacing +45 added lines, -45 removed lines

@@ -31,15 +31,15 @@ 
 	 * @param integer|null $id Unique resource ID
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
-	public function deleteAction( Request $request, $site = 'default', $resource, $id = null )
+	public function deleteAction(Request $request, $site = 'default', $resource, $id = null)
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$cntl = $this->createController( $site, $resource );
-		$result = $cntl->delete( $request->getContent(), $header, $status );
+		$cntl = $this->createController($site, $resource);
+		$result = $cntl->delete($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -52,15 +52,15 @@ 
 	 * @param integer|null $id Unique resource ID
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
-	public function getAction( Request $request, $site = 'default', $resource, $id = null )
+	public function getAction(Request $request, $site = 'default', $resource, $id = null)
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$cntl = $this->createController( $site, $resource );
-		$result = $cntl->get( $request->getContent(), $header, $status );
+		$cntl = $this->createController($site, $resource);
+		$result = $cntl->get($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -73,15 +73,15 @@ 
 	 * @param integer|null $id Unique resource ID
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
-	public function patchAction( Request $request, $site = 'default', $resource, $id = null )
+	public function patchAction(Request $request, $site = 'default', $resource, $id = null)
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$cntl = $this->createController( $site, $resource );
-		$result = $cntl->patch( $request->getContent(), $header, $status );
+		$cntl = $this->createController($site, $resource);
+		$result = $cntl->patch($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -94,15 +94,15 @@ 
 	 * @param integer $id Unique ID of the resource
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
-	public function postAction( Request $request, $site = 'default', $resource, $id = null )
+	public function postAction(Request $request, $site = 'default', $resource, $id = null)
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$cntl = $this->createController( $site, $resource );
-		$result = $cntl->post( $request->getContent(), $header, $status );
+		$cntl = $this->createController($site, $resource);
+		$result = $cntl->post($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -115,15 +115,15 @@ 
 	 * @param integer|null $id Unique resource ID
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
-	public function putAction( Request $request, $site = 'default', $resource, $id = null )
+	public function putAction(Request $request, $site = 'default', $resource, $id = null)
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$cntl = $this->createController( $site, $resource );
-		$result = $cntl->put( $request->getContent(), $header, $status );
+		$cntl = $this->createController($site, $resource);
+		$result = $cntl->put($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -135,15 +135,15 @@ 
 	 * @param string $sitecode Unique site code
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
-	public function optionsAction( Request $request, $site = 'default', $resource = '' )
+	public function optionsAction(Request $request, $site = 'default', $resource = '')
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$cntl = $this->createController( $site, $resource );
-		$result = $cntl->options( $request->getContent(), $header, $status );
+		$cntl = $this->createController($site, $resource);
+		$result = $cntl->options($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -153,20 +153,20 @@ 
 	 * @param string $sitecode Unique site code
 	 * @return \Aimeos\MShop\Context\Item\Iface Context item
 	 */
-	protected function createController( $sitecode, $resource )
+	protected function createController($sitecode, $resource)
 	{
-		$lang = \Input::get( 'lang', 'en' );
+		$lang = \Input::get('lang', 'en');
 
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
-		$templatePaths = $aimeos->getCustomPaths( 'controller/jsonadm/templates' );
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
+		$templatePaths = $aimeos->getCustomPaths('controller/jsonadm/templates');
 
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false );
-		$context = $this->setLocale( $context, $sitecode, $lang );
+		$context = app('\Aimeos\Shop\Base\Context')->get(false);
+		$context = $this->setLocale($context, $sitecode, $lang);
 
-		$view = app( '\Aimeos\Shop\Base\View' )->create( $context->getConfig(), $templatePaths, $lang );
-		$context->setView( $view );
+		$view = app('\Aimeos\Shop\Base\View')->create($context->getConfig(), $templatePaths, $lang);
+		$context->setView($view);
 
-		return \Aimeos\Controller\JsonAdm\Factory::createController( $context, $templatePaths, $resource );
+		return \Aimeos\Controller\JsonAdm\Factory::createController($context, $templatePaths, $resource);
 	}
 
 
@@ -178,12 +178,12 @@ 
 	 * @param array $header List of HTTP headers
 	 * @return \Illuminate\Http\Response HTTP response object
 	 */
-	protected function createResponse( $content, $status, array $header )
+	protected function createResponse($content, $status, array $header)
 	{
-		$response = \Response::make( $content, $status );
+		$response = \Response::make($content, $status);
 
-		foreach( $header as $key => $value ) {
-			$response->header( $key, $value );
+		foreach ($header as $key => $value) {
+			$response->header($key, $value);
 		}
 
 		return $response;
@@ -198,23 +198,23 @@ 
 	 * @param string $lang ISO language code, e.g. "en" or "en_GB"
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $sitecode, $lang )
+	protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode, $lang)
 	{
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
 
 		try
 		{
-			$localeItem = $localeManager->bootstrap( $sitecode, '', '', false );
-			$localeItem->setLanguageId( null );
-			$localeItem->setCurrencyId( null );
+			$localeItem = $localeManager->bootstrap($sitecode, '', '', false);
+			$localeItem->setLanguageId(null);
+			$localeItem->setCurrencyId(null);
 		}
-		catch( \Aimeos\MShop\Locale\Exception $e )
+		catch (\Aimeos\MShop\Locale\Exception $e)
 		{
 			$localeItem = $localeManager->createItem();
 		}
 
-		$context->setLocale( $localeItem );
-		$context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang ) ) );
+		$context->setLocale($localeItem);
+		$context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang)));
 
 		return $context;
 	}

src/Aimeos/Shop/ShopServiceProvider.php

Spacing +8 added lines, -8 removed lines

@@ -28,31 +28,31 @@
 	 */
 	public function boot()
 	{
-		$basedir = dirname(dirname(__DIR__)).DIRECTORY_SEPARATOR;
+		$basedir = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR;
 
-		$this->mergeConfigFrom(dirname(dirname(__DIR__)).DIRECTORY_SEPARATOR.'config/shop.php', 'shop');
+		$this->mergeConfigFrom(dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'config/shop.php', 'shop');
 
-		$this->loadViewsFrom($basedir.'views', 'shop');
+		$this->loadViewsFrom($basedir . 'views', 'shop');
 
 
 		$this->publishes(array(
-			$basedir.'config/shop.php' => config_path('shop.php'),
+			$basedir . 'config/shop.php' => config_path('shop.php'),
 		), 'config');
 
 		$this->publishes(array(
-			$basedir.'database/migrations' => base_path('database/migrations'),
+			$basedir . 'database/migrations' => base_path('database/migrations'),
 		), 'migrations');
 
 		$this->publishes(array(
-			$basedir.'views' => base_path('resources/views/vendor/shop'),
+			$basedir . 'views' => base_path('resources/views/vendor/shop'),
 		), 'views');
 
 		$this->publishes(array(
-			dirname($basedir).DIRECTORY_SEPARATOR.'public' => public_path('packages/aimeos/shop'),
+			dirname($basedir) . DIRECTORY_SEPARATOR . 'public' => public_path('packages/aimeos/shop'),
 		), 'public');
 
 
-		require $basedir.'routes.php';
+		require $basedir . 'routes.php';
 	}
 
 

src/config/shop.php

Spacing +18 added lines, -18 removed lines

@@ -3,7 +3,7 @@ 
 return array(
 	'apc_enabled' => false,
 	'apc_prefix' => 'laravel:',
-	'extdir' => ( is_dir(base_path('ext')) ? base_path('ext') : dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'ext' ),
+	'extdir' => (is_dir(base_path('ext')) ? base_path('ext') : dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'ext'),
 	'uploaddir' => '/',
 
 	'routes' => array(
@@ -14,16 +14,16 @@ 
 	),
 
 	'page' => array(
-		'account-index' => array( 'account/history','account/favorite','account/watch','basket/mini','catalog/session' ),
-		'basket-index' => array( '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/stage','catalog/lists' ),
-		'catalog-stock' => array( 'catalog/stock' ),
-		'catalog-suggest' => array( 'catalog/suggest' ),
-		'checkout-confirm' => array( 'checkout/confirm' ),
-		'checkout-index' => array( 'checkout/standard' ),
-		'checkout-update' => array( 'checkout/update'),
+		'account-index' => array('account/history', 'account/favorite', 'account/watch', 'basket/mini', 'catalog/session'),
+		'basket-index' => array('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/stage', 'catalog/lists'),
+		'catalog-stock' => array('catalog/stock'),
+		'catalog-suggest' => array('catalog/suggest'),
+		'checkout-confirm' => array('checkout/confirm'),
+		'checkout-index' => array('checkout/standard'),
+		'checkout-update' => array('checkout/update'),
 	),
 
 	'resource' => array(
@@ -34,7 +34,7 @@ 
 			'database' => env('DB_DATABASE', 'laravel'),
 			'username' => env('DB_USERNAME', 'root'),
 			'password' => env('DB_PASSWORD', ''),
-			'stmt' => array( "SET NAMES 'utf8'", "SET SESSION sql_mode='ANSI'" ),
+			'stmt' => array("SET NAMES 'utf8'", "SET SESSION sql_mode='ANSI'"),
 			'opt-persistent' => 0,
 			'limit' => 2,
 		),
@@ -158,7 +158,7 @@ 
 				'import' => array(
 					'text' => array(
 						'default' => array(
-							'uploaddir' => public_path( 'uploads' ),
+							'uploaddir' => public_path('uploads'),
 							'fileperms' => '0660',
 						),
 					),
@@ -166,7 +166,7 @@ 
 				'export' => array(
 					'text' => array(
 						'default' => array(
-							'exportdir' => public_path( 'uploads' ),
+							'exportdir' => public_path('uploads'),
 							'downloaddir' => 'uploads',
 						),
 					),
@@ -176,7 +176,7 @@ 
 				'import' => array(
 					'text' => array(
 						'default' => array(
-							'uploaddir' => public_path( 'uploads' ),
+							'uploaddir' => public_path('uploads'),
 							'fileperms' => '0660',
 						),
 					),
@@ -184,7 +184,7 @@ 
 				'export' => array(
 					'text' => array(
 						'default' => array(
-							'exportdir' => public_path( 'uploads' ),
+							'exportdir' => public_path('uploads'),
 							'downloaddir' => 'uploads',
 						),
 					),
@@ -254,7 +254,7 @@ 
 				'import' => array(
 					'text' => array(
 						'default' => array(
-							'uploaddir' => public_path( 'uploads' ),
+							'uploaddir' => public_path('uploads'),
 							'fileperms' => '0660',
 						),
 					),
@@ -262,7 +262,7 @@ 
 				'export' => array(
 					'text' => array(
 						'default' => array(
-							'exportdir' => public_path( 'uploads' ),
+							'exportdir' => public_path('uploads'),
 							'downloaddir' => 'uploads',
 						),
 					),

src/routes.php

Spacing +28 added lines, -28 removed lines

@@ -2,15 +2,15 @@ 
 
 Route::group(config('shop.routes.admin', []), function() {
 
-	Route::match( array( 'GET' ), 'admin/file', array(
+	Route::match(array('GET'), 'admin/file', array(
 		'as' => 'aimeos_shop_admin_file',
 		'uses' => 'Aimeos\Shop\Controller\AdminController@fileAction'
 	));
-	Route::match( array( 'POST' ), 'admin/do', array(
+	Route::match(array('POST'), 'admin/do', array(
 		'as' => 'aimeos_shop_admin_json',
 		'uses' => 'Aimeos\Shop\Controller\AdminController@doAction'
 	));
-	Route::match( array( 'GET' ), 'admin', array(
+	Route::match(array('GET'), 'admin', array(
 		'as' => 'aimeos_shop_admin',
 		'uses' => 'Aimeos\Shop\Controller\AdminController@indexAction'
 	));
@@ -20,50 +20,50 @@ 
 
 Route::group(config('shop.routes.jsonadm', []), function() {
 
-	Route::match( array( 'DELETE' ), 'jsonadm/{resource}/{id?}', array(
+	Route::match(array('DELETE'), 'jsonadm/{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_delete',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@deleteAction'
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
 
-	Route::match( array( 'GET' ), 'jsonadm/{resource}/{id?}', array(
+	Route::match(array('GET'), 'jsonadm/{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_get',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@getAction'
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
 
-	Route::match( array( 'PATCH' ), 'jsonadm/{resource}/{id?}', array(
+	Route::match(array('PATCH'), 'jsonadm/{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_patch',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@patchAction'
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
 
-	Route::match( array( 'POST' ), 'jsonadm/{resource}/{id?}', array(
+	Route::match(array('POST'), 'jsonadm/{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_post',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@postAction'
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
 
-	Route::match( array( 'PUT' ), 'jsonadm/{resource}/{id?}', array(
+	Route::match(array('PUT'), 'jsonadm/{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_put',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@putAction'
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
 
-	Route::match( array( 'OPTIONS' ), 'jsonadm/{resource?}', array(
+	Route::match(array('OPTIONS'), 'jsonadm/{resource?}', array(
 		'as' => 'aimeos_shop_jsonadm_options',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@optionsAction'
-	))->where( array( 'resource' => '[^0-9]*' ) );
+	))->where(array('resource' => '[^0-9]*'));
 
 });
 
 
 Route::group(config('shop.routes.account', ['middleware' => 'auth']), function() {
 
-	Route::match( array( 'GET', 'POST' ), 'myaccount', array(
+	Route::match(array('GET', 'POST'), 'myaccount', array(
 		'as' => 'aimeos_shop_account',
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
 	));
-	Route::match( array( 'GET', 'POST' ), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
+	Route::match(array('GET', 'POST'), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
 		'as' => 'aimeos_shop_account_favorite',
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
 	));
-	Route::match( array( 'GET', 'POST' ), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
+	Route::match(array('GET', 'POST'), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
 		'as' => 'aimeos_shop_account_watch',
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
 	));
@@ -73,45 +73,45 @@ 
 
 Route::group(config('shop.routes.default', []), function() {
 
-	Route::match( array( 'GET', 'POST' ), 'basket', array(
+	Route::match(array('GET', 'POST'), 'basket', array(
 		'as' => 'aimeos_shop_basket',
 		'uses' => 'Aimeos\Shop\Controller\BasketController@indexAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'count', array(
+	Route::match(array('GET', 'POST'), 'count', array(
 		'as' => 'aimeos_shop_count',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@countAction'
 	));
-	Route::match( array( 'GET', 'POST' ), 'detail/{d_prodid}/{d_name?}/{l_pos?}', array(
+	Route::match(array('GET', 'POST'), 'detail/{d_prodid}/{d_name?}/{l_pos?}', array(
 		'as' => 'aimeos_shop_detail',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
 	));
-	Route::match( array( 'GET', 'POST' ), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
+	Route::match(array('GET', 'POST'), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
 		'as' => 'aimeos_shop_session_pinned',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
 	));
-	Route::match( array( 'GET', 'POST' ), 'list', array(
+	Route::match(array('GET', 'POST'), 'list', array(
 		'as' => 'aimeos_shop_list',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@listAction'
 	));
-	Route::match( array( 'GET', 'POST' ), 'suggest', array(
+	Route::match(array('GET', 'POST'), 'suggest', array(
 		'as' => 'aimeos_shop_suggest',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@suggestAction'
 	));
-	Route::match( array( 'GET', 'POST' ), 'stock', array(
+	Route::match(array('GET', 'POST'), 'stock', array(
 		'as' => 'aimeos_shop_stock',
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@stockAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'checkout/{c_step?}', array(
+	Route::match(array('GET', 'POST'), 'checkout/{c_step?}', array(
 		'as' => 'aimeos_shop_checkout',
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@indexAction'
 	));
-	Route::match( array( 'GET', 'POST' ), 'confirm', array(
+	Route::match(array('GET', 'POST'), 'confirm', array(
 		'as' => 'aimeos_shop_confirm',
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction'
 	));
-	Route::match( array( 'GET', 'POST' ), 'update', array(
+	Route::match(array('GET', 'POST'), 'update', array(
 		'as' => 'aimeos_shop_update',
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@updateAction'
 	));