Inspection of "Fixed site and JSON encoded site item" - aimeos/aimeos-laravel - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( d63c8b...a78503 )

by Aimeos

created 2016-06-06 23:20 UTC

Status

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -9,7 +9,7 @@  discard block
 block discarded – undo
         <link type="text/css" rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/resources/css/ext-all.css" />
         <link type="text/css" rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/resources/css/xtheme-gray.css" />
 @foreach ($cssFiles as $cssFile)
-        <link rel="stylesheet" href="<?= asset('packages/aimeos/shop/' . $cssFile) ?>" />
+        <link rel="stylesheet" href="<?= asset('packages/aimeos/shop/'.$cssFile) ?>" />
 @endforeach
 
         <script type="text/javascript">
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
 
         <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/adapter/ext/ext-base.js"></script>
         <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/ext-all.js"></script>
-        <script type="text/javascript" src="<?= route( 'aimeos_shop_extadm_file', array( 'site' => $site ) ); ?>"></script>
+        <script type="text/javascript" src="<?= route('aimeos_shop_extadm_file', array('site' => $site)); ?>"></script>
 
     </head>
     <body>

Please login to merge, or discard this patch.

src/Aimeos/Shop/Controller/AdminController.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -36,20 +36,20 @@
 block discarded – undo
 	 * @param \Illuminate\Http\Request $request Laravel request object
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
 	 */
-	public function indexAction( Request $request )
+	public function indexAction(Request $request)
 	{
-		if( config( 'shop.authorize', true ) && ( Auth::check() === false
-			|| $request->user()->can( 'admin', ['admin', 'editor'] ) ) === false
+		if (config('shop.authorize', true) && (Auth::check() === false
+			|| $request->user()->can('admin', ['admin', 'editor'])) === false
 		) {
-			return View::make( 'shop::admin.index' );
+			return View::make('shop::admin.index');
 		}
 
 		$param = array(
 			'resource' => 'product',
-			'site' => Route::input( 'site', Input::get( 'site', 'default' ) ),
-			'lang' => Route::input( 'lang', Input::get( 'lang', config( 'app.locale', 'en' ) ) )
+			'site' => Route::input('site', Input::get('site', 'default')),
+			'lang' => Route::input('lang', Input::get('lang', config('app.locale', 'en')))
 		);
 
-		return redirect()->route( 'aimeos_shop_jqadm_search', $param );
+		return redirect()->route('aimeos_shop_jqadm_search', $param);
 	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

src/Aimeos/Shop/Controller/JqadmController.php 1 patch

Spacing +57 added lines, -57 removed lines patch added patch discarded remove patch

@@ -34,38 +34,38 @@  discard block
 block discarded – undo
 	 */
 	public function fileAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [['admin', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [['admin', 'editor']]);
 		}
 
 		$contents = '';
 		$files = array();
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
-		$type = Route::input( 'type', Input::get( 'type', 'js' ) );
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
+		$type = Route::input('type', Input::get('type', 'js'));
 
-		foreach( $aimeos->getCustomPaths( 'admin/jqadm' ) as $base => $paths )
+		foreach ($aimeos->getCustomPaths('admin/jqadm') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
-				$jsbAbsPath = $base . '/' . $path;
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
-				$files = array_merge( $files, $jsb2->getFiles( $type ) );
+				$jsbAbsPath = $base.'/'.$path;
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
+				$files = array_merge($files, $jsb2->getFiles($type));
 			}
 		}
 
-		foreach( $files as $file )
+		foreach ($files as $file)
 		{
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
+			if (($content = file_get_contents($file)) !== false) {
 				$contents .= $content;
 			}
 		}
 
-		$response = response( $contents );
+		$response = response($contents);
 
-		if( $type === 'js' ) {
-			$response->header( 'Content-Type', 'application/javascript' );
-		} elseif( $type === 'css' ) {
-			$response->header( 'Content-Type', 'text/css' );
+		if ($type === 'js') {
+			$response->header('Content-Type', 'application/javascript');
+		} elseif ($type === 'css') {
+			$response->header('Content-Type', 'text/css');
 		}
 
 		return $response;
@@ -79,12 +79,12 @@  discard block
 block discarded – undo
 	 */
 	public function copyAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [['admin', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [['admin', 'editor']]);
 		}
 
 		$cntl = $this->createClient();
-		return $this->getHtml( $cntl->copy() );
+		return $this->getHtml($cntl->copy());
 	}
 
 
@@ -95,12 +95,12 @@  discard block
 block discarded – undo
 	 */
 	public function createAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [['admin', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [['admin', 'editor']]);
 		}
 
 		$cntl = $this->createClient();
-		return $this->getHtml( $cntl->create() );
+		return $this->getHtml($cntl->create());
 	}
 
 
@@ -111,12 +111,12 @@  discard block
 block discarded – undo
 	 */
 	public function deleteAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [['admin', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [['admin', 'editor']]);
 		}
 
 		$cntl = $this->createClient();
-		return $this->getHtml( $cntl->delete() . $cntl->search() );
+		return $this->getHtml($cntl->delete().$cntl->search());
 	}
 
 
@@ -127,12 +127,12 @@  discard block
 block discarded – undo
 	 */
 	public function getAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [['admin', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [['admin', 'editor']]);
 		}
 
 		$cntl = $this->createClient();
-		return $this->getHtml( $cntl->get() );
+		return $this->getHtml($cntl->get());
 	}
 
 
@@ -143,12 +143,12 @@  discard block
 block discarded – undo
 	 */
 	public function saveAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [['admin', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [['admin', 'editor']]);
 		}
 
 		$cntl = $this->createClient();
-		return $this->getHtml( ( $cntl->save() ? : $cntl->search() ) );
+		return $this->getHtml(($cntl->save() ?: $cntl->search()));
 	}
 
 
@@ -159,12 +159,12 @@  discard block
 block discarded – undo
 	 */
 	public function searchAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [['admin', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [['admin', 'editor']]);
 		}
 
 		$cntl = $this->createClient();
-		return $this->getHtml( $cntl->search() );
+		return $this->getHtml($cntl->search());
 	}
 
 
@@ -175,20 +175,20 @@  discard block
 block discarded – undo
 	 */
 	protected function createClient()
 	{
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
-		$lang = Input::get( 'lang', config( 'app.locale', 'en' ) );
-		$resource = Route::input( 'resource' );
+		$site = Route::input('site', Input::get('site', 'default'));
+		$lang = Input::get('lang', config('app.locale', 'en'));
+		$resource = Route::input('resource');
 
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' );
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
+		$templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates');
 
-		$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);
 
-		$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\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource );
+		return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource);
 	}
 
 
@@ -198,13 +198,13 @@  discard block
 block discarded – undo
 	 * @param string $content Content from admin client
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
 	 */
-	protected function getHtml( $content )
+	protected function getHtml($content)
 	{
-		$version = app( '\Aimeos\Shop\Base\Aimeos' )->getVersion();
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
-		$content = str_replace( ['{type}', '{version}'], ['Laravel', $version], $content );
+		$version = app('\Aimeos\Shop\Base\Aimeos')->getVersion();
+		$site = Route::input('site', Input::get('site', 'default'));
+		$content = str_replace(['{type}', '{version}'], ['Laravel', $version], $content);
 
-		return View::make( 'shop::jqadm.index', array( 'content' => $content, 'site' => $site ) );
+		return View::make('shop::jqadm.index', array('content' => $content, 'site' => $site));
 	}
 
 
@@ -216,23 +216,23 @@  discard block
 block discarded – undo
 	 * @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, $site, $lang )
+	protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $site, $lang)
 	{
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
 
 		try
 		{
-			$localeItem = $localeManager->bootstrap( $site, '', '', false );
-			$localeItem->setLanguageId( null );
-			$localeItem->setCurrencyId( null );
+			$localeItem = $localeManager->bootstrap($site, '', '', 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, 'en' ) ) );
+		$context->setLocale($localeItem);
+		$context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en')));
 
 		return $context;
 	}

Please login to merge, or discard this patch.

src/Aimeos/Shop/Controller/ExtadmController.php 1 patch

Spacing +77 added lines, -77 removed lines patch added patch discarded remove patch

@@ -34,65 +34,65 @@  discard block
 block discarded – undo
 	 * @param \Illuminate\Http\Request $request Laravel request object
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
 	 */
-	public function indexAction( Request $request )
+	public function indexAction(Request $request)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [['admin']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [['admin']]);
 		}
 
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
-		$lang = Route::input( 'lang', Input::get( 'lang', config( 'app.locale', 'en' ) ) );
-		$tab = Route::input( 'tab', Input::get( 'tab', 0 ) );
+		$site = Route::input('site', Input::get('site', 'default'));
+		$lang = Route::input('lang', Input::get('lang', config('app.locale', 'en')));
+		$tab = Route::input('tab', Input::get('tab', 0));
 
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' );
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos');
 
 		$bootstrap = $aimeos->get();
-		$cntlPaths = $bootstrap->getCustomPaths( 'controller/extjs' );
+		$cntlPaths = $bootstrap->getCustomPaths('controller/extjs');
 
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false );
-		$context = $this->setLocale( $context, $site );
+		$context = app('\Aimeos\Shop\Base\Context')->get(false);
+		$context = $this->setLocale($context, $site);
 
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
 		$cssFiles = array();
 
-		foreach( $bootstrap->getCustomPaths( 'admin/extjs' ) as $base => $paths )
+		foreach ($bootstrap->getCustomPaths('admin/extjs') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
-				$jsbAbsPath = $base . '/' . $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'));
 			}
 		}
 
-		$jqadmUrl = route( 'aimeos_shop_jqadm_search', array( 'site' => $site, 'resource' => 'product' ) );
-		$jsonUrl = route( 'aimeos_shop_extadm_json', array( 'site' => $site, '_token' => csrf_token() ) );
-		$adminUrl = route( 'aimeos_shop_extadm', array( 'site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>' ) );
+		$jqadmUrl = route('aimeos_shop_jqadm_search', array('site' => $site, 'resource' => 'product'));
+		$jsonUrl = route('aimeos_shop_extadm_json', array('site' => $site, '_token' => csrf_token()));
+		$adminUrl = route('aimeos_shop_extadm', array('site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>'));
 
 		$vars = array(
 			'site' => $site,
 			'lang' => $lang,
 			'cssFiles' => $cssFiles,
-			'languages' => $this->getJsonLanguages( $context),
-			'config' => $this->getJsonClientConfig( $context ),
-			'siteitem' => $this->getJsonSiteItem( $context, $site ),
-			'i18nContent' => $this->getJsonClientI18n( $bootstrap->getI18nPaths(), $lang ),
+			'languages' => $this->getJsonLanguages($context),
+			'config' => $this->getJsonClientConfig($context),
+			'siteitem' => $this->getJsonSiteItem($context, $site),
+			'i18nContent' => $this->getJsonClientI18n($bootstrap->getI18nPaths(), $lang),
 			'searchSchemas' => $controller->getJsonSearchSchemas(),
 			'itemSchemas' => $controller->getJsonItemSchemas(),
-			'smd' => $controller->getJsonSmd( $jsonUrl ),
-			'urlTemplate' => str_replace( ['<', '>'], ['{', '}'], urldecode( $adminUrl ) ),
-			'uploaddir' => config( 'shop::uploaddir' ),
+			'smd' => $controller->getJsonSmd($jsonUrl),
+			'urlTemplate' => str_replace(['<', '>'], ['{', '}'], urldecode($adminUrl)),
+			'uploaddir' => config('shop::uploaddir'),
 			'version' => $aimeos->getVersion(),
 			'jqadmurl' => $jqadmUrl,
 			'activeTab' => $tab,
 		);
 
-		return View::make( 'shop::extadm.index', $vars );
+		return View::make('shop::extadm.index', $vars);
 	}
 
 
@@ -102,23 +102,23 @@  discard block
 block discarded – undo
 	 * @param \Illuminate\Http\Request $request Laravel request object
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
 	 */
-	public function doAction( Request $request )
+	public function doAction(Request $request)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [['admin']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [['admin']]);
 		}
 
-		$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->setView( app( '\Aimeos\Shop\Base\View' )->create( $context->getConfig(), array() ) );
-		$context = $this->setLocale( $context );
+		$context = app('\Aimeos\Shop\Base\Context')->get(false);
+		$context->setView(app('\Aimeos\Shop\Base\View')->create($context->getConfig(), array()));
+		$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(), $request->getContent() );
-		return View::make( 'shop::extadm.do', array( 'output' => $response ) );
+		$response = $controller->process(Input::instance()->request->all(), $request->getContent());
+		return View::make('shop::extadm.do', array('output' => $response));
 	}
 
 
@@ -129,32 +129,32 @@  discard block
 block discarded – undo
 	 */
 	public function fileAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [['admin']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [['admin']]);
 		}
 
 		$contents = '';
 		$jsFiles = array();
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
 
-		foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths )
+		foreach ($aimeos->getCustomPaths('admin/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->getFiles( 'js' ) );
+				$jsbAbsPath = $base.'/'.$path;
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
+				$jsFiles = array_merge($jsFiles, $jsb2->getFiles('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');
 	}
 
 
@@ -164,15 +164,15 @@  discard block
 block discarded – undo
 	 * @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)
 	{
 		$result = array();
 
-		foreach( app( '\Aimeos\Shop\Base\Aimeos' )->get()->getI18nList( 'admin' ) as $id ) {
-			$result[] = array( 'id' => $id, 'label' => $id );
+		foreach (app('\Aimeos\Shop\Base\Aimeos')->get()->getI18nList('admin') as $id) {
+			$result[] = array('id' => $id, 'label' => $id);
 		}
 
-		return json_encode( $result );
+		return json_encode($result);
 	}
 
 
@@ -182,10 +182,10 @@  discard block
 block discarded – undo
 	 * @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( 'admin/extjs', array() );
-		return json_encode( array( 'admin' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT );
+		$config = $context->getConfig()->get('admin/extjs', array());
+		return json_encode(array('admin' => array('extjs' => $config)), JSON_FORCE_OBJECT);
 	}
 
 
@@ -196,16 +196,16 @@  discard block
 block discarded – undo
 	 * @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\Gettext( $i18nPaths, $lang );
+		$i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $lang);
 
 		$content = array(
-			'admin' => $i18n->getAll( 'admin' ),
-			'admin/ext' => $i18n->getAll( 'admin/ext' ),
+			'admin' => $i18n->getAll('admin'),
+			'admin/ext' => $i18n->getAll('admin/ext'),
 		);
 
-		return json_encode( $content, JSON_FORCE_OBJECT );
+		return json_encode($content, JSON_FORCE_OBJECT);
 	}
 
 
@@ -217,19 +217,19 @@  discard block
 block discarded – undo
 	 * @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());
 	}
 
 
@@ -240,22 +240,22 @@  discard block
 block discarded – undo
 	 * @param string $sitecode Unique site code
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default' )
+	protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default')
 	{
-		$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->setLocale($localeItem);
 
 		return $context;
 	}

Please login to merge, or discard this patch.

		@@ -9,7 +9,7 @@ discard block
		block discarded – undo
9	9	<link type="text/css" rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/resources/css/ext-all.css" />
10	10	<link type="text/css" rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/resources/css/xtheme-gray.css" />
11	11	@foreach ($cssFiles as $cssFile)
12		- <link rel="stylesheet" href="<?= asset('packages/aimeos/shop/' . $cssFile) ?>" />
	12	+ <link rel="stylesheet" href="<?= asset('packages/aimeos/shop/'.$cssFile) ?>" />
13	13	@endforeach
14	14
15	15	<script type="text/javascript">
		@@ -45,7 +45,7 @@ discard block
		block discarded – undo
45	45
46	46	<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/adapter/ext/ext-base.js"></script>
47	47	<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/ext-all.js"></script>
48		- <script type="text/javascript" src="<?= route( 'aimeos_shop_extadm_file', array( 'site' => $site ) ); ?>"></script>
	48	+ <script type="text/javascript" src="<?= route('aimeos_shop_extadm_file', array('site' => $site)); ?>"></script>
49	49
50	50	</head>
51	51	<body>

		@@ -36,20 +36,20 @@
		block discarded – undo
36	36	* @param \Illuminate\Http\Request $request Laravel request object
37	37	* @return \Illuminate\Contracts\View\View View for rendering the output
38	38	*/
39		- public function indexAction( Request $request )
	39	+ public function indexAction(Request $request)
40	40	{
41		- if( config( 'shop.authorize', true ) && ( Auth::check() === false
42		- \|\| $request->user()->can( 'admin', ['admin', 'editor'] ) ) === false
	41	+ if (config('shop.authorize', true) && (Auth::check() === false
	42	+ \|\| $request->user()->can('admin', ['admin', 'editor'])) === false
43	43	) {
44		- return View::make( 'shop::admin.index' );
	44	+ return View::make('shop::admin.index');
45	45	}
46	46
47	47	$param = array(
48	48	'resource' => 'product',
49		- 'site' => Route::input( 'site', Input::get( 'site', 'default' ) ),
50		- 'lang' => Route::input( 'lang', Input::get( 'lang', config( 'app.locale', 'en' ) ) )
	49	+ 'site' => Route::input('site', Input::get('site', 'default')),
	50	+ 'lang' => Route::input('lang', Input::get('lang', config('app.locale', 'en')))
51	51	);
52	52
53		- return redirect()->route( 'aimeos_shop_jqadm_search', $param );
	53	+ return redirect()->route('aimeos_shop_jqadm_search', $param);
54	54	}
55	55	}
56	56	\ No newline at end of file

		@@ -34,38 +34,38 @@ discard block
		block discarded – undo
34	34	*/
35	35	public function fileAction()
36	36	{
37		- if( config( 'shop.authorize', true ) ) {
38		- $this->authorize( 'admin', [['admin', 'editor']] );
	37	+ if (config('shop.authorize', true)) {
	38	+ $this->authorize('admin', [['admin', 'editor']]);
39	39	}
40	40
41	41	$contents = '';
42	42	$files = array();
43		- $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
44		- $type = Route::input( 'type', Input::get( 'type', 'js' ) );
	43	+ $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
	44	+ $type = Route::input('type', Input::get('type', 'js'));
45	45
46		- foreach( $aimeos->getCustomPaths( 'admin/jqadm' ) as $base => $paths )
	46	+ foreach ($aimeos->getCustomPaths('admin/jqadm') as $base => $paths)
47	47	{
48		- foreach( $paths as $path )
	48	+ foreach ($paths as $path)
49	49	{
50		- $jsbAbsPath = $base . '/' . $path;
51		- $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
52		- $files = array_merge( $files, $jsb2->getFiles( $type ) );
	50	+ $jsbAbsPath = $base.'/'.$path;
	51	+ $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
	52	+ $files = array_merge($files, $jsb2->getFiles($type));
53	53	}
54	54	}
55	55
56		- foreach( $files as $file )
	56	+ foreach ($files as $file)
57	57	{
58		- if( ( $content = file_get_contents( $file ) ) !== false ) {
	58	+ if (($content = file_get_contents($file)) !== false) {
59	59	$contents .= $content;
60	60	}
61	61	}
62	62
63		- $response = response( $contents );
	63	+ $response = response($contents);
64	64
65		- if( $type === 'js' ) {
66		- $response->header( 'Content-Type', 'application/javascript' );
67		- } elseif( $type === 'css' ) {
68		- $response->header( 'Content-Type', 'text/css' );
	65	+ if ($type === 'js') {
	66	+ $response->header('Content-Type', 'application/javascript');
	67	+ } elseif ($type === 'css') {
	68	+ $response->header('Content-Type', 'text/css');
69	69	}
70	70
71	71	return $response;
		@@ -79,12 +79,12 @@ discard block
		block discarded – undo
79	79	*/
80	80	public function copyAction()
81	81	{
82		- if( config( 'shop.authorize', true ) ) {
83		- $this->authorize( 'admin', [['admin', 'editor']] );
	82	+ if (config('shop.authorize', true)) {
	83	+ $this->authorize('admin', [['admin', 'editor']]);
84	84	}
85	85
86	86	$cntl = $this->createClient();
87		- return $this->getHtml( $cntl->copy() );
	87	+ return $this->getHtml($cntl->copy());
88	88	}
89	89
90	90
		@@ -95,12 +95,12 @@ discard block
		block discarded – undo
95	95	*/
96	96	public function createAction()
97	97	{
98		- if( config( 'shop.authorize', true ) ) {
99		- $this->authorize( 'admin', [['admin', 'editor']] );
	98	+ if (config('shop.authorize', true)) {
	99	+ $this->authorize('admin', [['admin', 'editor']]);
100	100	}
101	101
102	102	$cntl = $this->createClient();
103		- return $this->getHtml( $cntl->create() );
	103	+ return $this->getHtml($cntl->create());
104	104	}
105	105
106	106
		@@ -111,12 +111,12 @@ discard block
		block discarded – undo
111	111	*/
112	112	public function deleteAction()
113	113	{
114		- if( config( 'shop.authorize', true ) ) {
115		- $this->authorize( 'admin', [['admin', 'editor']] );
	114	+ if (config('shop.authorize', true)) {
	115	+ $this->authorize('admin', [['admin', 'editor']]);
116	116	}
117	117
118	118	$cntl = $this->createClient();
119		- return $this->getHtml( $cntl->delete() . $cntl->search() );
	119	+ return $this->getHtml($cntl->delete().$cntl->search());
120	120	}
121	121
122	122
		@@ -127,12 +127,12 @@ discard block
		block discarded – undo
127	127	*/
128	128	public function getAction()
129	129	{
130		- if( config( 'shop.authorize', true ) ) {
131		- $this->authorize( 'admin', [['admin', 'editor']] );
	130	+ if (config('shop.authorize', true)) {
	131	+ $this->authorize('admin', [['admin', 'editor']]);
132	132	}
133	133
134	134	$cntl = $this->createClient();
135		- return $this->getHtml( $cntl->get() );
	135	+ return $this->getHtml($cntl->get());
136	136	}
137	137
138	138
		@@ -143,12 +143,12 @@ discard block
		block discarded – undo
143	143	*/
144	144	public function saveAction()
145	145	{
146		- if( config( 'shop.authorize', true ) ) {
147		- $this->authorize( 'admin', [['admin', 'editor']] );
	146	+ if (config('shop.authorize', true)) {
	147	+ $this->authorize('admin', [['admin', 'editor']]);
148	148	}
149	149
150	150	$cntl = $this->createClient();
151		- return $this->getHtml( ( $cntl->save() ? : $cntl->search() ) );
	151	+ return $this->getHtml(($cntl->save() ?: $cntl->search()));
152	152	}
153	153
154	154
		@@ -159,12 +159,12 @@ discard block
		block discarded – undo
159	159	*/
160	160	public function searchAction()
161	161	{
162		- if( config( 'shop.authorize', true ) ) {
163		- $this->authorize( 'admin', [['admin', 'editor']] );
	162	+ if (config('shop.authorize', true)) {
	163	+ $this->authorize('admin', [['admin', 'editor']]);
164	164	}
165	165
166	166	$cntl = $this->createClient();
167		- return $this->getHtml( $cntl->search() );
	167	+ return $this->getHtml($cntl->search());
168	168	}
169	169
170	170
		@@ -175,20 +175,20 @@ discard block
		block discarded – undo
175	175	*/
176	176	protected function createClient()
177	177	{
178		- $site = Route::input( 'site', Input::get( 'site', 'default' ) );
179		- $lang = Input::get( 'lang', config( 'app.locale', 'en' ) );
180		- $resource = Route::input( 'resource' );
	178	+ $site = Route::input('site', Input::get('site', 'default'));
	179	+ $lang = Input::get('lang', config('app.locale', 'en'));
	180	+ $resource = Route::input('resource');
181	181
182		- $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
183		- $templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' );
	182	+ $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
	183	+ $templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates');
184	184
185		- $context = app( '\Aimeos\Shop\Base\Context' )->get( false );
186		- $context = $this->setLocale( $context, $site, $lang );
	185	+ $context = app('\Aimeos\Shop\Base\Context')->get(false);
	186	+ $context = $this->setLocale($context, $site, $lang);
187	187
188		- $view = app( '\Aimeos\Shop\Base\View' )->create( $context->getConfig(), $templatePaths, $lang );
189		- $context->setView( $view );
	188	+ $view = app('\Aimeos\Shop\Base\View')->create($context->getConfig(), $templatePaths, $lang);
	189	+ $context->setView($view);
190	190
191		- return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource );
	191	+ return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource);
192	192	}
193	193
194	194
		@@ -198,13 +198,13 @@ discard block
		block discarded – undo
198	198	* @param string $content Content from admin client
199	199	* @return \Illuminate\Contracts\View\View View for rendering the output
200	200	*/
201		- protected function getHtml( $content )
	201	+ protected function getHtml($content)
202	202	{
203		- $version = app( '\Aimeos\Shop\Base\Aimeos' )->getVersion();
204		- $site = Route::input( 'site', Input::get( 'site', 'default' ) );
205		- $content = str_replace( ['{type}', '{version}'], ['Laravel', $version], $content );
	203	+ $version = app('\Aimeos\Shop\Base\Aimeos')->getVersion();
	204	+ $site = Route::input('site', Input::get('site', 'default'));
	205	+ $content = str_replace(['{type}', '{version}'], ['Laravel', $version], $content);
206	206
207		- return View::make( 'shop::jqadm.index', array( 'content' => $content, 'site' => $site ) );
	207	+ return View::make('shop::jqadm.index', array('content' => $content, 'site' => $site));
208	208	}
209	209
210	210
		@@ -216,23 +216,23 @@ discard block
		block discarded – undo
216	216	* @param string $lang ISO language code, e.g. "en" or "en_GB"
217	217	* @return \Aimeos\MShop\Context\Item\Iface Modified context object
218	218	*/
219		- protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $site, $lang )
	219	+ protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $site, $lang)
220	220	{
221		- $localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
	221	+ $localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
222	222
223	223	try
224	224	{
225		- $localeItem = $localeManager->bootstrap( $site, '', '', false );
226		- $localeItem->setLanguageId( null );
227		- $localeItem->setCurrencyId( null );
	225	+ $localeItem = $localeManager->bootstrap($site, '', '', false);
	226	+ $localeItem->setLanguageId(null);
	227	+ $localeItem->setCurrencyId(null);
228	228	}
229		- catch( \Aimeos\MShop\Locale\Exception $e )
	229	+ catch (\Aimeos\MShop\Locale\Exception $e)
230	230	{
231	231	$localeItem = $localeManager->createItem();
232	232	}
233	233
234		- $context->setLocale( $localeItem );
235		- $context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang, 'en' ) ) );
	234	+ $context->setLocale($localeItem);
	235	+ $context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en')));
236	236
237	237	return $context;
238	238	}

		@@ -34,65 +34,65 @@ discard block
		block discarded – undo
34	34	* @param \Illuminate\Http\Request $request Laravel request object
35	35	* @return \Illuminate\Contracts\View\View View for rendering the output
36	36	*/
37		- public function indexAction( Request $request )
	37	+ public function indexAction(Request $request)
38	38	{
39		- if( config( 'shop.authorize', true ) ) {
40		- $this->authorize( 'admin', [['admin']] );
	39	+ if (config('shop.authorize', true)) {
	40	+ $this->authorize('admin', [['admin']]);
41	41	}
42	42
43		- $site = Route::input( 'site', Input::get( 'site', 'default' ) );
44		- $lang = Route::input( 'lang', Input::get( 'lang', config( 'app.locale', 'en' ) ) );
45		- $tab = Route::input( 'tab', Input::get( 'tab', 0 ) );
	43	+ $site = Route::input('site', Input::get('site', 'default'));
	44	+ $lang = Route::input('lang', Input::get('lang', config('app.locale', 'en')));
	45	+ $tab = Route::input('tab', Input::get('tab', 0));
46	46
47		- $aimeos = app( '\Aimeos\Shop\Base\Aimeos' );
	47	+ $aimeos = app('\Aimeos\Shop\Base\Aimeos');
48	48
49	49	$bootstrap = $aimeos->get();
50		- $cntlPaths = $bootstrap->getCustomPaths( 'controller/extjs' );
	50	+ $cntlPaths = $bootstrap->getCustomPaths('controller/extjs');
51	51
52		- $context = app( '\Aimeos\Shop\Base\Context' )->get( false );
53		- $context = $this->setLocale( $context, $site );
	52	+ $context = app('\Aimeos\Shop\Base\Context')->get(false);
	53	+ $context = $this->setLocale($context, $site);
54	54
55		- $controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
	55	+ $controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
56	56	$cssFiles = array();
57	57
58		- foreach( $bootstrap->getCustomPaths( 'admin/extjs' ) as $base => $paths )
	58	+ foreach ($bootstrap->getCustomPaths('admin/extjs') as $base => $paths)
59	59	{
60		- foreach( $paths as $path )
	60	+ foreach ($paths as $path)
61	61	{
62		- $jsbAbsPath = $base . '/' . $path;
	62	+ $jsbAbsPath = $base.'/'.$path;
63	63
64		- if( !is_file( $jsbAbsPath ) ) {
65		- throw new \Exception( sprintf( 'JSB2 file "%1$s" not found', $jsbAbsPath ) );
	64	+ if (!is_file($jsbAbsPath)) {
	65	+ throw new \Exception(sprintf('JSB2 file "%1$s" not found', $jsbAbsPath));
66	66	}
67	67
68		- $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $path ) );
69		- $cssFiles = array_merge( $cssFiles, $jsb2->getUrls( 'css' ) );
	68	+ $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($path));
	69	+ $cssFiles = array_merge($cssFiles, $jsb2->getUrls('css'));
70	70	}
71	71	}
72	72
73		- $jqadmUrl = route( 'aimeos_shop_jqadm_search', array( 'site' => $site, 'resource' => 'product' ) );
74		- $jsonUrl = route( 'aimeos_shop_extadm_json', array( 'site' => $site, '_token' => csrf_token() ) );
75		- $adminUrl = route( 'aimeos_shop_extadm', array( 'site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>' ) );
	73	+ $jqadmUrl = route('aimeos_shop_jqadm_search', array('site' => $site, 'resource' => 'product'));
	74	+ $jsonUrl = route('aimeos_shop_extadm_json', array('site' => $site, '_token' => csrf_token()));
	75	+ $adminUrl = route('aimeos_shop_extadm', array('site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>'));
76	76
77	77	$vars = array(
78	78	'site' => $site,
79	79	'lang' => $lang,
80	80	'cssFiles' => $cssFiles,
81		- 'languages' => $this->getJsonLanguages( $context),
82		- 'config' => $this->getJsonClientConfig( $context ),
83		- 'siteitem' => $this->getJsonSiteItem( $context, $site ),
84		- 'i18nContent' => $this->getJsonClientI18n( $bootstrap->getI18nPaths(), $lang ),
	81	+ 'languages' => $this->getJsonLanguages($context),
	82	+ 'config' => $this->getJsonClientConfig($context),
	83	+ 'siteitem' => $this->getJsonSiteItem($context, $site),
	84	+ 'i18nContent' => $this->getJsonClientI18n($bootstrap->getI18nPaths(), $lang),
85	85	'searchSchemas' => $controller->getJsonSearchSchemas(),
86	86	'itemSchemas' => $controller->getJsonItemSchemas(),
87		- 'smd' => $controller->getJsonSmd( $jsonUrl ),
88		- 'urlTemplate' => str_replace( ['<', '>'], ['{', '}'], urldecode( $adminUrl ) ),
89		- 'uploaddir' => config( 'shop::uploaddir' ),
	87	+ 'smd' => $controller->getJsonSmd($jsonUrl),
	88	+ 'urlTemplate' => str_replace(['<', '>'], ['{', '}'], urldecode($adminUrl)),
	89	+ 'uploaddir' => config('shop::uploaddir'),
90	90	'version' => $aimeos->getVersion(),
91	91	'jqadmurl' => $jqadmUrl,
92	92	'activeTab' => $tab,
93	93	);
94	94
95		- return View::make( 'shop::extadm.index', $vars );
	95	+ return View::make('shop::extadm.index', $vars);
96	96	}
97	97
98	98
		@@ -102,23 +102,23 @@ discard block
		block discarded – undo
102	102	* @param \Illuminate\Http\Request $request Laravel request object
103	103	* @return \Illuminate\Contracts\View\View View for rendering the output
104	104	*/
105		- public function doAction( Request $request )
	105	+ public function doAction(Request $request)
106	106	{
107		- if( config( 'shop.authorize', true ) ) {
108		- $this->authorize( 'admin', [['admin']] );
	107	+ if (config('shop.authorize', true)) {
	108	+ $this->authorize('admin', [['admin']]);
109	109	}
110	110
111		- $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
112		- $cntlPaths = $aimeos->getCustomPaths( 'controller/extjs' );
	111	+ $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
	112	+ $cntlPaths = $aimeos->getCustomPaths('controller/extjs');
113	113
114		- $context = app( '\Aimeos\Shop\Base\Context' )->get( false );
115		- $context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context->getConfig(), array() ) );
116		- $context = $this->setLocale( $context );
	114	+ $context = app('\Aimeos\Shop\Base\Context')->get(false);
	115	+ $context->setView(app('\Aimeos\Shop\Base\View')->create($context->getConfig(), array()));
	116	+ $context = $this->setLocale($context);
117	117
118		- $controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
	118	+ $controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
119	119
120		- $response = $controller->process( Input::instance()->request->all(), $request->getContent() );
121		- return View::make( 'shop::extadm.do', array( 'output' => $response ) );
	120	+ $response = $controller->process(Input::instance()->request->all(), $request->getContent());
	121	+ return View::make('shop::extadm.do', array('output' => $response));
122	122	}
123	123
124	124
		@@ -129,32 +129,32 @@ discard block
		block discarded – undo
129	129	*/
130	130	public function fileAction()
131	131	{
132		- if( config( 'shop.authorize', true ) ) {
133		- $this->authorize( 'admin', [['admin']] );
	132	+ if (config('shop.authorize', true)) {
	133	+ $this->authorize('admin', [['admin']]);
134	134	}
135	135
136	136	$contents = '';
137	137	$jsFiles = array();
138		- $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
	138	+ $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
139	139
140		- foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths )
	140	+ foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths)
141	141	{
142		- foreach( $paths as $path )
	142	+ foreach ($paths as $path)
143	143	{
144		- $jsbAbsPath = $base . '/' . $path;
145		- $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
146		- $jsFiles = array_merge( $jsFiles, $jsb2->getFiles( 'js' ) );
	144	+ $jsbAbsPath = $base.'/'.$path;
	145	+ $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
	146	+ $jsFiles = array_merge($jsFiles, $jsb2->getFiles('js'));
147	147	}
148	148	}
149	149
150		- foreach( $jsFiles as $file )
	150	+ foreach ($jsFiles as $file)
151	151	{
152		- if( ( $content = file_get_contents( $file ) ) !== false ) {
	152	+ if (($content = file_get_contents($file)) !== false) {
153	153	$contents .= $content;
154	154	}
155	155	}
156	156
157		- return response( $contents )->header( 'Content-Type', 'application/javascript' );
	157	+ return response($contents)->header('Content-Type', 'application/javascript');
158	158	}
159	159
160	160
		@@ -164,15 +164,15 @@ discard block
		block discarded – undo
164	164	* @param \Aimeos\MShop\Context\Item\Iface $context Context object
165	165	* @return array List of language IDs with labels
166	166	*/
167		- protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context )
	167	+ protected function getJsonLanguages(\Aimeos\MShop\Context\Item\Iface $context)
168	168	{
169	169	$result = array();
170	170
171		- foreach( app( '\Aimeos\Shop\Base\Aimeos' )->get()->getI18nList( 'admin' ) as $id ) {
172		- $result[] = array( 'id' => $id, 'label' => $id );
	171	+ foreach (app('\Aimeos\Shop\Base\Aimeos')->get()->getI18nList('admin') as $id) {
	172	+ $result[] = array('id' => $id, 'label' => $id);
173	173	}
174	174
175		- return json_encode( $result );
	175	+ return json_encode($result);
176	176	}
177	177
178	178
		@@ -182,10 +182,10 @@ discard block
		block discarded – undo
182	182	* @param \Aimeos\MShop\Context\Item\Iface $context Context item object
183	183	* @return string JSON encoded configuration object
184	184	*/
185		- protected function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context )
	185	+ protected function getJsonClientConfig(\Aimeos\MShop\Context\Item\Iface $context)
186	186	{
187		- $config = $context->getConfig()->get( 'admin/extjs', array() );
188		- return json_encode( array( 'admin' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT );
	187	+ $config = $context->getConfig()->get('admin/extjs', array());
	188	+ return json_encode(array('admin' => array('extjs' => $config)), JSON_FORCE_OBJECT);
189	189	}
190	190
191	191
		@@ -196,16 +196,16 @@ discard block
		block discarded – undo
196	196	* @param string $lang ISO language code like "en" or "en_GB"
197	197	* @return string JSON encoded translation object
198	198	*/
199		- protected function getJsonClientI18n( array $i18nPaths, $lang )
	199	+ protected function getJsonClientI18n(array $i18nPaths, $lang)
200	200	{
201		- $i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $lang );
	201	+ $i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $lang);
202	202
203	203	$content = array(
204		- 'admin' => $i18n->getAll( 'admin' ),
205		- 'admin/ext' => $i18n->getAll( 'admin/ext' ),
	204	+ 'admin' => $i18n->getAll('admin'),
	205	+ 'admin/ext' => $i18n->getAll('admin/ext'),
206	206	);
207	207
208		- return json_encode( $content, JSON_FORCE_OBJECT );
	208	+ return json_encode($content, JSON_FORCE_OBJECT);
209	209	}
210	210
211	211
		@@ -217,19 +217,19 @@ discard block
		block discarded – undo
217	217	* @return string JSON encoded site item object
218	218	* @throws Exception If no site item was found for the code
219	219	*/
220		- protected function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site )
	220	+ protected function getJsonSiteItem(\Aimeos\MShop\Context\Item\Iface $context, $site)
221	221	{
222		- $manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );
	222	+ $manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');
223	223
224	224	$criteria = $manager->createSearch();
225		- $criteria->setConditions( $criteria->compare( '==', 'locale.site.code', $site ) );
226		- $items = $manager->searchItems( $criteria );
	225	+ $criteria->setConditions($criteria->compare('==', 'locale.site.code', $site));
	226	+ $items = $manager->searchItems($criteria);
227	227
228		- if( ( $item = reset( $items ) ) === false ) {
229		- throw new \Exception( sprintf( 'No site found for code "%1$s"', $site ) );
	228	+ if (($item = reset($items)) === false) {
	229	+ throw new \Exception(sprintf('No site found for code "%1$s"', $site));
230	230	}
231	231
232		- return json_encode( $item->toArray() );
	232	+ return json_encode($item->toArray());
233	233	}
234	234
235	235
		@@ -240,22 +240,22 @@ discard block
		block discarded – undo
240	240	* @param string $sitecode Unique site code
241	241	* @return \Aimeos\MShop\Context\Item\Iface Modified context object
242	242	*/
243		- protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default' )
	243	+ protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default')
244	244	{
245		- $localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
	245	+ $localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
246	246
247	247	try
248	248	{
249		- $localeItem = $localeManager->bootstrap( $sitecode, '', '', false );
250		- $localeItem->setLanguageId( null );
251		- $localeItem->setCurrencyId( null );
	249	+ $localeItem = $localeManager->bootstrap($sitecode, '', '', false);
	250	+ $localeItem->setLanguageId(null);
	251	+ $localeItem->setCurrencyId(null);
252	252	}
253		- catch( \Aimeos\MShop\Locale\Exception $e )
	253	+ catch (\Aimeos\MShop\Locale\Exception $e)
254	254	{
255	255	$localeItem = $localeManager->createItem();
256	256	}
257	257
258		- $context->setLocale( $localeItem );
	258	+ $context->setLocale($localeItem);
259	259
260	260	return $context;
261	261	}

aimeos / aimeos-laravel

Push — master ( d63c8b...a78503 )

Status

Category

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +57 added lines, -57 removed lines patch added patch discarded remove patch

Spacing +77 added lines, -77 removed lines patch added patch discarded remove patch