aimeos / aimeos-laravel

src/Aimeos/Shop/Command/SetupCommand.php

Spacing +26 added lines, -26 removed lines

@@ -49,39 +49,39 @@ 
 	 */
 	public function handle()
 	{
-		$ctx = $this->getLaravel()->make( '\Aimeos\Shop\Base\Context' )->get( false, 'command' );
-		$ctx->setEditor( 'aimeos:setup' );
+		$ctx = $this->getLaravel()->make('\Aimeos\Shop\Base\Context')->get(false, 'command');
+		$ctx->setEditor('aimeos:setup');
 
 		$config = $ctx->getConfig();
-		$site = $this->argument( 'site' );
-		$template = $this->argument( 'tplsite' );
+		$site = $this->argument('site');
+		$template = $this->argument('tplsite');
 
-		$config->set( 'setup/site', $site );
-		$dbconfig = $this->getDbConfig( $config );
-		$this->setOptions( $config );
+		$config->set('setup/site', $site);
+		$dbconfig = $this->getDbConfig($config);
+		$this->setOptions($config);
 
-		$taskPaths = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get()->getSetupPaths( $template );
-		$manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx );
+		$taskPaths = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get()->getSetupPaths($template);
+		$manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx);
 
-		$this->info( sprintf( 'Initializing or updating the Aimeos database tables for site "%1$s"', $site ) );
+		$this->info(sprintf('Initializing or updating the Aimeos database tables for site "%1$s"', $site));
 
-		if( ( $task = $this->option( 'task' ) ) && is_array( $task ) ) {
-			$task = reset( $task );
+		if (($task = $this->option('task')) && is_array($task)) {
+			$task = reset($task);
 		}
 
-		switch( $this->option( 'action' ) )
+		switch ($this->option('action'))
 		{
 			case 'migrate':
-				$manager->migrate( $task );
+				$manager->migrate($task);
 				break;
 			case 'rollback':
-				$manager->rollback( $task );
+				$manager->rollback($task);
 				break;
 			case 'clean':
-				$manager->clean( $task );
+				$manager->clean($task);
 				break;
 			default:
-				throw new \Exception( sprintf( 'Invalid setup action "%1$s"', $this->option( 'action' ) ) );
+				throw new \Exception(sprintf('Invalid setup action "%1$s"', $this->option('action')));
 		}
 	}
 
@@ -92,14 +92,14 @@ 
 	 * @param \Aimeos\MW\Config\Iface $conf Config object
 	 * @return array Multi-dimensional associative list of database configuration parameters
 	 */
-	protected function getDbConfig( \Aimeos\MW\Config\Iface $conf )
+	protected function getDbConfig(\Aimeos\MW\Config\Iface $conf)
 	{
-		$dbconfig = $conf->get( 'resource', array() );
+		$dbconfig = $conf->get('resource', array());
 
-		foreach( $dbconfig as $rname => $dbconf )
+		foreach ($dbconfig as $rname => $dbconf)
 		{
-			if( strncmp( $rname, 'db', 2 ) !== 0 ) {
-				unset( $dbconfig[$rname] );
+			if (strncmp($rname, 'db', 2) !== 0) {
+				unset($dbconfig[$rname]);
 			}
 		}
 
@@ -114,12 +114,12 @@ 
 	 * @param array Associative list of database configurations
 	 * @throws \RuntimeException If the format of the options is invalid
 	 */
-	protected function setOptions( \Aimeos\MW\Config\Iface $conf )
+	protected function setOptions(\Aimeos\MW\Config\Iface $conf)
 	{
-		foreach( (array) $this->option( 'option' ) as $option )
+		foreach ((array) $this->option('option') as $option)
 		{
-			list( $name, $value ) = explode( ':', $option );
-			$conf->set( str_replace( '\\', '/', $name ), $value );
+			list($name, $value) = explode(':', $option);
+			$conf->set(str_replace('\\', '/', $name), $value);
 		}
 	}
 }

src/Aimeos/Shop/Command/CacheCommand.php

Spacing +10 added lines, -10 removed lines

@@ -44,24 +44,24 @@
 	 */
 	public function handle()
 	{
-		$context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false, 'command' );
-		$context->setEditor( 'aimeos:cache' );
+		$context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false, 'command');
+		$context->setEditor('aimeos:cache');
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
 
-		foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem )
+		foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem)
 		{
-			$localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
 
 			$lcontext = clone $context;
-			$lcontext->setLocale( $localeItem );
+			$lcontext->setLocale($localeItem);
 
-			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext );
-			$lcontext->setCache( $cache );
+			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext);
+			$lcontext->setCache($cache);
 
-			$this->info( sprintf( 'Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode() ) );
+			$this->info(sprintf('Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode()));
 
-			\Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->clear();
+			\Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->clear();
 		}
 	}
 }

src/Aimeos/Shop/Controller/JsonadmController.php

Spacing +34 added lines, -34 removed lines

@@ -36,13 +36,13 @@ 
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function deleteAction( ServerRequestInterface $request )
+	public function deleteAction(ServerRequestInterface $request)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'super']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'super']]);
 		}
 
-		return $this->createClient()->delete( $request, new Response() );
+		return $this->createClient()->delete($request, new Response());
 	}
 
 
@@ -52,13 +52,13 @@ 
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function getAction( ServerRequestInterface $request )
+	public function getAction(ServerRequestInterface $request)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'editor', 'super']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor', 'super']]);
 		}
 
-		return $this->createClient()->get( $request, new Response() );
+		return $this->createClient()->get($request, new Response());
 	}
 
 
@@ -68,13 +68,13 @@ 
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function patchAction( ServerRequestInterface $request )
+	public function patchAction(ServerRequestInterface $request)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'super']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'super']]);
 		}
 
-		return $this->createClient()->patch( $request, new Response() );
+		return $this->createClient()->patch($request, new Response());
 	}
 
 
@@ -84,13 +84,13 @@ 
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function postAction( ServerRequestInterface $request )
+	public function postAction(ServerRequestInterface $request)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'super']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'super']]);
 		}
 
-		return $this->createClient()->post( $request, new Response() );
+		return $this->createClient()->post($request, new Response());
 	}
 
 
@@ -100,13 +100,13 @@ 
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function putAction( ServerRequestInterface $request )
+	public function putAction(ServerRequestInterface $request)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'super']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'super']]);
 		}
 
-		return $this->createClient()->put( $request, new Response() );
+		return $this->createClient()->put($request, new Response());
 	}
 
 
@@ -116,13 +116,13 @@ 
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function optionsAction( ServerRequestInterface $request )
+	public function optionsAction(ServerRequestInterface $request)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'editor', 'super']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor', 'super']]);
 		}
 
-		return $this->createClient()->options( $request, new Response() );
+		return $this->createClient()->options($request, new Response());
 	}
 
 
@@ -133,18 +133,18 @@ 
 	 */
 	protected function createClient()
 	{
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
-		$lang = Input::get( 'locale', config( 'app.locale', 'en' ) );
-		$resource = Route::input( 'resource' );
+		$site = Route::input('site', Input::get('site', 'default'));
+		$lang = Input::get('locale', config('app.locale', 'en'));
+		$resource = Route::input('resource');
 
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' );
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
+		$templatePaths = $aimeos->getCustomPaths('admin/jsonadm/templates');
 
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' );
-		$context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang, 'en' ) ) );
-		$context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) );
-		$context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $templatePaths, $lang ) );
+		$context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend');
+		$context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en')));
+		$context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site));
+		$context->setView(app('\Aimeos\Shop\Base\View')->create($context, $templatePaths, $lang));
 
-		return \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, $resource );
+		return \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, $resource);
 	}
 }

src/views/jqadm/index.blade.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/css/tether.min.css" integrity="sha256-y4TDcAD4/j5o4keZvggf698Cr9Oc7JZ+gGMax23qmVA=" crossorigin="anonymous" />
 		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0=" crossorigin="anonymous" />
 		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
-		<link rel="stylesheet" href="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'lang' => 'en', 'type' => 'css' ) ); ?>">
+		<link rel="stylesheet" href="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'lang' => 'en', 'type' => 'css')); ?>">
 	</head>
 	<body>
 		<div class="app-menu" style="text-align: right; margin: 0 2.5%;">
@@ -33,6 +33,6 @@ 
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.6.2/ckeditor.js" integrity="sha256-TD9khtuB9OoHJICSCe1SngH2RckROdDPDb5JJaUTi7I=" crossorigin="anonymous"></script>
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.6.2/adapters/jquery.js" integrity="sha256-kWca68zAjkLv7iMEyHDuFKa9KxIij+DiCScmbTMlJHM=" crossorigin="anonymous"></script>
 		<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script>		<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js"></script>
-		<script src="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'lang' => 'en', 'type' => 'js' ) ); ?>"></script>
+		<script src="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'lang' => 'en', 'type' => 'js')); ?>"></script>
 	</body>
 </html>

src/Aimeos/Shop/Controller/JqadmController.php

Spacing +60 added lines, -60 removed lines

@@ -34,38 +34,38 @@ 
 	 */
 	public function fileAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'super']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'super']]);
 		}
 
 		$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,17 +79,17 @@ 
 	 */
 	public function copyAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'super']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'super']]);
 		}
 
 		$cntl = $this->createClient();
 
-		if( ( $html = $cntl->copy() ) == '' ) {
+		if (($html = $cntl->copy()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -100,17 +100,17 @@ 
 	 */
 	public function createAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'super']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'super']]);
 		}
 
 		$cntl = $this->createClient();
 
-		if( ( $html = $cntl->create() ) == '' ) {
+		if (($html = $cntl->create()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -121,17 +121,17 @@ 
 	 */
 	public function deleteAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'super']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'super']]);
 		}
 
 		$cntl = $this->createClient();
 
-		if( ( $html = $cntl->delete() ) == '' ) {
+		if (($html = $cntl->delete()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -142,17 +142,17 @@ 
 	 */
 	public function exportAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'super']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'super']]);
 		}
 
 		$cntl = $this->createClient();
 
-		if( ( $html = $cntl->export() ) == '' ) {
+		if (($html = $cntl->export()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -163,17 +163,17 @@ 
 	 */
 	public function getAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'super']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'super']]);
 		}
 
 		$cntl = $this->createClient();
 
-		if( ( $html = $cntl->get() ) == '' ) {
+		if (($html = $cntl->get()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -184,17 +184,17 @@ 
 	 */
 	public function saveAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'super']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'super']]);
 		}
 
 		$cntl = $this->createClient();
 
-		if( ( $html = $cntl->save() ) == '' ) {
+		if (($html = $cntl->save()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -205,17 +205,17 @@ 
 	 */
 	public function searchAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'super']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'super']]);
 		}
 
 		$cntl = $this->createClient();
 
-		if( ( $html = $cntl->search() ) == '' ) {
+		if (($html = $cntl->search()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -226,19 +226,19 @@ 
 	 */
 	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, 'backend' );
-		$context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang, 'en' ) ) );
-		$context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) );
-		$context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $templatePaths, $lang ) );
+		$context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend');
+		$context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en')));
+		$context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site));
+		$context->setView(app('\Aimeos\Shop\Base\View')->create($context, $templatePaths, $lang));
 
-		return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $aimeos, $resource );
+		return \Aimeos\Admin\JQAdm\Factory::createClient($context, $aimeos, $resource);
 	}
 
 
@@ -248,15 +248,15 @@ 
 	 * @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)
 	{
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' );
-		$extnames = implode( ',', $aimeos->get()->getExtensions() );
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos');
+		$extnames = implode(',', $aimeos->get()->getExtensions());
 		$version = $aimeos->getVersion();
 
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
-		$content = str_replace( ['{type}', '{version}', '{extensions}'], ['Laravel', $version, $extnames], $content );
+		$site = Route::input('site', Input::get('site', 'default'));
+		$content = str_replace(['{type}', '{version}', '{extensions}'], ['Laravel', $version, $extnames], $content);
 
-		return View::make( 'shop::jqadm.index', array( 'content' => $content, 'site' => $site ) );
+		return View::make('shop::jqadm.index', array('content' => $content, 'site' => $site));
 	}
 }

src/routes.php

Spacing +48 added lines, -48 removed lines

@@ -2,7 +2,7 @@ 
 
 Route::group(config('shop.routes.login', ['middleware' => ['web']]), function() {
 
-	Route::match( array( 'GET' ), 'admin', array(
+	Route::match(array('GET'), 'admin', array(
 		'as' => 'aimeos_shop_admin',
 		'uses' => 'Aimeos\Shop\Controller\AdminController@indexAction'
 	));
@@ -12,112 +12,112 @@ 
 
 Route::group(config('shop.routes.jqadm', ['prefix' => 'admin/{site}/jqadm', 'middleware' => ['web', 'auth']]), function() {
 
-	Route::match( array( 'GET' ), 'file/{type}', array(
+	Route::match(array('GET'), 'file/{type}', array(
 		'as' => 'aimeos_shop_jqadm_file',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@fileAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'copy/{resource}/{id}', array(
+	Route::match(array('GET', 'POST'), 'copy/{resource}/{id}', array(
 		'as' => 'aimeos_shop_jqadm_copy',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@copyAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]+' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]+'));
 
-	Route::match( array( 'GET', 'POST' ), 'create/{resource}', array(
+	Route::match(array('GET', 'POST'), 'create/{resource}', array(
 		'as' => 'aimeos_shop_jqadm_create',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@createAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]+' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]+'));
 
-	Route::match( array( 'GET', 'POST' ), 'delete/{resource}/{id}', array(
+	Route::match(array('GET', 'POST'), 'delete/{resource}/{id}', array(
 		'as' => 'aimeos_shop_jqadm_delete',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@deleteAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]+' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]+'));
 
-	Route::match( array( 'GET', 'POST' ), 'export/{resource}', array(
+	Route::match(array('GET', 'POST'), 'export/{resource}', array(
 		'as' => 'aimeos_shop_jqadm_export',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@exportAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]+' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]+'));
 
-	Route::match( array( 'GET' ), 'get/{resource}/{id}', array(
+	Route::match(array('GET'), 'get/{resource}/{id}', array(
 		'as' => 'aimeos_shop_jqadm_get',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@getAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]+' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]+'));
 
-	Route::match( array( 'POST' ), 'save/{resource}', array(
+	Route::match(array('POST'), 'save/{resource}', array(
 		'as' => 'aimeos_shop_jqadm_save',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@saveAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]+' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]+'));
 
-	Route::match( array( 'GET', 'POST' ), 'search/{resource}', array(
+	Route::match(array('GET', 'POST'), 'search/{resource}', array(
 		'as' => 'aimeos_shop_jqadm_search',
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@searchAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]+' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]+'));
 
 });
 
 
 Route::group(config('shop.routes.jsonadm', ['prefix' => 'admin/{site}/jsonadm', 'middleware' => ['web', 'auth']]), function() {
 
-	Route::match( array( 'DELETE' ), '{resource}/{id?}', array(
+	Route::match(array('DELETE'), '{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_delete',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@deleteAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*'));
 
-	Route::match( array( 'GET' ), '{resource}/{id?}', array(
+	Route::match(array('GET'), '{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_get',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@getAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*'));
 
-	Route::match( array( 'PATCH' ), '{resource}/{id?}', array(
+	Route::match(array('PATCH'), '{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_patch',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@patchAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*'));
 
-	Route::match( array( 'POST' ), '{resource}/{id?}', array(
+	Route::match(array('POST'), '{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_post',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@postAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*'));
 
-	Route::match( array( 'PUT' ), '{resource}/{id?}', array(
+	Route::match(array('PUT'), '{resource}/{id?}', array(
 		'as' => 'aimeos_shop_jsonadm_put',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@putAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*'));
 
-	Route::match( array( 'OPTIONS' ), '{resource?}', array(
+	Route::match(array('OPTIONS'), '{resource?}', array(
 		'as' => 'aimeos_shop_jsonadm_options',
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@optionsAction'
-	))->where( array( 'resource' => '[^0-9A-Z\-\_]*' ) );
+	))->where(array('resource' => '[^0-9A-Z\-\_]*'));
 
 });
 
 
 Route::group(config('shop.routes.jsonapi', ['prefix' => 'jsonapi', 'middleware' => ['web', 'api']]), function() {
 
-	Route::match( array( 'DELETE' ), '{resource}', array(
+	Route::match(array('DELETE'), '{resource}', array(
 		'as' => 'aimeos_shop_jsonapi_delete',
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@deleteAction'
 	));
 
-	Route::match( array( 'GET' ), '{resource}', array(
+	Route::match(array('GET'), '{resource}', array(
 		'as' => 'aimeos_shop_jsonapi_get',
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@getAction'
 	));
 
-	Route::match( array( 'PATCH' ), '{resource}', array(
+	Route::match(array('PATCH'), '{resource}', array(
 		'as' => 'aimeos_shop_jsonapi_patch',
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@patchAction'
 	));
 
-	Route::match( array( 'POST' ), '{resource}', array(
+	Route::match(array('POST'), '{resource}', array(
 		'as' => 'aimeos_shop_jsonapi_post',
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@postAction'
 	));
 
-	Route::match( array( 'PUT' ), '{resource}', array(
+	Route::match(array('PUT'), '{resource}', array(
 		'as' => 'aimeos_shop_jsonapi_put',
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@putAction'
 	));
 
-	Route::match( array( 'OPTIONS' ), '{resource?}', array(
+	Route::match(array('OPTIONS'), '{resource?}', array(
 		'as' => 'aimeos_shop_jsonapi_options',
 		'uses' => 'Aimeos\Shop\Controller\JsonapiController@optionsAction'
 	));
@@ -127,22 +127,22 @@ 
 
 Route::group(config('shop.routes.account', ['middleware' => ['web', 'auth']]), function() {
 
-	Route::match( array( 'GET', 'POST' ), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
+	Route::match(array('GET', 'POST'), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_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?}/{d_pos?}', array(
+	Route::match(array('GET', 'POST'), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array(
 		'as' => 'aimeos_shop_account_watch',
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'myaccount/download/{dl_id}', array(
+	Route::match(array('GET', 'POST'), 'myaccount/download/{dl_id}', array(
 		'as' => 'aimeos_shop_account_download',
 		'uses' => 'Aimeos\Shop\Controller\AccountController@downloadAction'
 	));
 
-	Route::match( array( 'GET', 'POST' ), 'myaccount', array(
+	Route::match(array('GET', 'POST'), 'myaccount', array(
 		'as' => 'aimeos_shop_account',
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
 	));
@@ -152,47 +152,47 @@ 
 
 Route::group(config('shop.routes.default', ['middleware' => ['web']]), function() {
 
-	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?}/{d_pos?}', array(
+	Route::match(array('GET', 'POST'), 'detail/{d_prodid}/{d_name?}/{d_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?}/{d_pos?}', array(
+	Route::match(array('GET', 'POST'), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_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' ), 'basket', array(
+	Route::match(array('GET', 'POST'), 'basket', array(
 		'as' => 'aimeos_shop_basket',
 		'uses' => 'Aimeos\Shop\Controller\BasketController@indexAction'
 	));
 
-	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/{code?}', array(
+	Route::match(array('GET', 'POST'), 'confirm/{code?}', array(
 		'as' => 'aimeos_shop_confirm',
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction'
 	));
@@ -202,7 +202,7 @@ 
 
 Route::group(config('shop.routes.update', []), function() {
 
-	Route::match( array( 'GET', 'POST' ), 'update', array(
+	Route::match(array('GET', 'POST'), 'update', array(
 		'as' => 'aimeos_shop_update',
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@updateAction'
 	));

src/Aimeos/Shop/Controller/AdminController.php

Doc Comments +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 	 * Returns the initial HTML view for the admin interface.
 	 *
 	 * @param \Illuminate\Http\Request $request Laravel request object
-	 * @return \Illuminate\Contracts\View\View View for rendering the output
+	 * @return \Illuminate\Http\RedirectResponse View for rendering the output
 	 */
 	public function indexAction( Request $request )
 	{

Spacing +10 added lines, -10 removed lines

@@ -36,25 +36,25 @@
 	 * @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( Auth::check() === false
-			|| $request->user()->can( 'admin', [AdminController::class, ['admin', 'editor', 'super']] ) === false
+		if (Auth::check() === false
+			|| $request->user()->can('admin', [AdminController::class, ['admin', 'editor', 'super']]) === false
 		) {
-			return redirect()->guest( 'login' );
+			return redirect()->guest('login');
 		}
 
 		$siteId = $request->user()->siteid;
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false );
-		$siteManager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );
-		$siteCode = ( $siteId ? $siteManager->getItem( $siteId )->getCode() : 'default' );
+		$context = app('\Aimeos\Shop\Base\Context')->get(false);
+		$siteManager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');
+		$siteCode = ($siteId ? $siteManager->getItem($siteId)->getCode() : 'default');
 
 		$param = array(
 			'resource' => 'dashboard',
-			'site' => Route::input( 'site', Input::get( 'site', $siteCode ) ),
-			'lang' => Route::input( 'lang', Input::get( 'lang', $request->user()->langid ?: config( 'app.locale', 'en' ) ) )
+			'site' => Route::input('site', Input::get('site', $siteCode)),
+			'lang' => Route::input('lang', Input::get('lang', $request->user()->langid ?: config('app.locale', 'en')))
 		);
 
-		return redirect()->route( 'aimeos_shop_jqadm_search', $param );
+		return redirect()->route('aimeos_shop_jqadm_search', $param);
 	}
 }