aimeos / aimeos-laravel

src/Aimeos/Shop/Controller/CatalogController.php

Spacing +5 added lines, -5 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function countAction()
 	{
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'catalog-count' );
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('catalog-count');
 
 		return Response::view('shop::catalog.count', $params)
 			->header('Content-Type', 'application/javascript');
@@ -43,7 +43,7 @@ 
 	 */
 	public function detailAction()
 	{
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-detail' );
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-detail');
 		return Response::view('shop::catalog.detail', $params);
 	}
 
@@ -55,7 +55,7 @@ 
 	 */
 	public function listAction()
 	{
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-list' );
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-list');
 		return Response::view('shop::catalog.list', $params);
 	}
 
@@ -67,7 +67,7 @@ 
 	 */
 	public function stockAction()
 	{
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-stock' );
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-stock');
 
 		return Response::view('shop::catalog.stock', $params)
 			->header('Content-Type', 'application/javascript');
@@ -81,7 +81,7 @@ 
 	 */
 	public function suggestAction()
 	{
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-suggest' );
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-suggest');
 
 		return Response::view('shop::catalog.suggest', $params)
 			->header('Content-Type', 'application/json');

src/Aimeos/Shop/Controller/AccountController.php

Spacing +7 added lines, -7 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function indexAction()
 	{
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'account-index' );
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('account-index');
 		return Response::view('shop::account.index', $params);
 	}
 
@@ -41,17 +41,17 @@ 
 	 */
 	public function downloadAction()
 	{
-		$context = app( '\Aimeos\Shop\Base\Context' )->get();
+		$context = app('\Aimeos\Shop\Base\Context')->get();
 		$langid = $context->getLocale()->getLanguageId();
 
-		$view = app( '\Aimeos\Shop\Base\View' )->create( $context, array(), $langid );
-		$context->setView( $view );
+		$view = app('\Aimeos\Shop\Base\View')->create($context, array(), $langid);
+		$context->setView($view);
 
-		$client = \Aimeos\Client\Html\Factory::createClient( $context, array(), 'account/download' );
-		$client->setView( $view );
+		$client = \Aimeos\Client\Html\Factory::createClient($context, array(), 'account/download');
+		$client->setView($view);
 		$client->process();
 
 		$response = $view->response();
-		return Response::make( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() );
+		return Response::make((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders());
 	}
 }
\ No newline at end of file

src/Aimeos/Shop/Base/Context.php

Spacing +60 added lines, -60 removed lines

@@ -55,7 +55,7 @@ 
 	 * @param \Aimeos\Shop\Base\Locale $locale Locale object
 	 * @param \Aimeos\Shop\Base\I18n $i18n Internationalisation object
 	 */
-	public function __construct( \Illuminate\Session\Store $session, \Aimeos\Shop\Base\Config $config, \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\I18n $i18n )
+	public function __construct(\Illuminate\Session\Store $session, \Aimeos\Shop\Base\Config $config, \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\I18n $i18n)
 	{
 		$this->session = $session;
 		$this->config = $config;
@@ -71,36 +71,36 @@ 
 	 * @param string $type Configuration type, i.e. "frontend" or "backend" (deprecated, use \Aimeos\Shop\Base\Config)
 	 * @return \Aimeos\MShop\Context\Item\Iface Context object
 	 */
-	public function get( $locale = true, $type = 'frontend' )
+	public function get($locale = true, $type = 'frontend')
 	{
-		$config = $this->config->get( $type );
+		$config = $this->config->get($type);
 
-		if( $this->context === null )
+		if ($this->context === null)
 		{
 			$context = new \Aimeos\MShop\Context\Item\Standard();
-			$context->setConfig( $config );
-
-			$this->addDataBaseManager( $context );
-			$this->addFilesystemManager( $context );
-			$this->addMessageQueueManager( $context );
-			$this->addLogger( $context );
-			$this->addCache( $context );
-			$this->addMailer( $context);
-			$this->addProcess( $context );
-			$this->addSession( $context );
-			$this->addUser( $context);
-			$this->addGroups( $context);
+			$context->setConfig($config);
+
+			$this->addDataBaseManager($context);
+			$this->addFilesystemManager($context);
+			$this->addMessageQueueManager($context);
+			$this->addLogger($context);
+			$this->addCache($context);
+			$this->addMailer($context);
+			$this->addProcess($context);
+			$this->addSession($context);
+			$this->addUser($context);
+			$this->addGroups($context);
 
 			$this->context = $context;
 		}
 
-		$this->context->setConfig( $config );
+		$this->context->setConfig($config);
 
-		if( $locale === true )
+		if ($locale === true)
 		{
-			$localeItem = $this->locale->get( $this->context );
-			$this->context->setLocale( $localeItem );
-			$this->context->setI18n( $this->i18n->get( array( $localeItem->getLanguageId() ) ) );
+			$localeItem = $this->locale->get($this->context);
+			$this->context->setLocale($localeItem);
+			$this->context->setI18n($this->i18n->get(array($localeItem->getLanguageId())));
 		}
 
 		return $this->context;
@@ -113,11 +113,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object including config
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addCache( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addCache(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context );
+		$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context);
 
-		return $context->setCache( $cache );
+		return $context->setCache($cache);
 	}
 
 
@@ -127,11 +127,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addDatabaseManager( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addDatabaseManager(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$dbm = new \Aimeos\MW\DB\Manager\DBAL( $context->getConfig() );
+		$dbm = new \Aimeos\MW\DB\Manager\DBAL($context->getConfig());
 
-		return $context->setDatabaseManager( $dbm );
+		return $context->setDatabaseManager($dbm);
 	}
 
 
@@ -141,14 +141,14 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addFilesystemManager( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addFilesystemManager(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$config = $context->getConfig();
-		$path = storage_path( 'aimeos' );
+		$path = storage_path('aimeos');
 
-		$fs = new \Aimeos\MW\Filesystem\Manager\Laravel( app( 'filesystem' ), $config, $path );
+		$fs = new \Aimeos\MW\Filesystem\Manager\Laravel(app('filesystem'), $config, $path);
 
-		return $context->setFilesystemManager( $fs );
+		return $context->setFilesystemManager($fs);
 	}
 
 
@@ -158,11 +158,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addLogger( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addLogger(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager( $context );
+		$logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager($context);
 
-		return $context->setLogger( $logger );
+		return $context->setLogger($logger);
 	}
 
 
@@ -173,11 +173,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addMailer( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addMailer(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$mail = new \Aimeos\MW\Mail\Swift( function() { return app( 'mailer' )->getSwiftMailer(); } );
+		$mail = new \Aimeos\MW\Mail\Swift(function() { return app('mailer')->getSwiftMailer(); } );
 
-		return $context->setMail( $mail );
+		return $context->setMail($mail);
 	}
 
 
@@ -187,11 +187,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addMessageQueueManager( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addMessageQueueManager(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$mq = new \Aimeos\MW\MQueue\Manager\Standard( $context->getConfig() );
+		$mq = new \Aimeos\MW\MQueue\Manager\Standard($context->getConfig());
 
-		return $context->setMessageQueueManager( $mq );
+		return $context->setMessageQueueManager($mq);
 	}
 
 
@@ -201,16 +201,16 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addProcess( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addProcess(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$config = $context->getConfig();
-		$max = $config->get( 'pcntl_max', 4 );
-		$prio = $config->get( 'pcntl_priority', 19 );
+		$max = $config->get('pcntl_max', 4);
+		$prio = $config->get('pcntl_priority', 19);
 
-		$process = new \Aimeos\MW\Process\Pcntl( $max, $prio );
-		$process = new \Aimeos\MW\Process\Decorator\Check( $process );
+		$process = new \Aimeos\MW\Process\Pcntl($max, $prio);
+		$process = new \Aimeos\MW\Process\Decorator\Check($process);
 
-		return $context->setProcess( $process );
+		return $context->setProcess($process);
 	}
 
 
@@ -220,11 +220,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addSession( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addSession(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$session = new \Aimeos\MW\Session\Laravel5( $this->session );
+		$session = new \Aimeos\MW\Session\Laravel5($this->session);
 
-		return $context->setSession( $session );
+		return $context->setSession($session);
 	}
 
 
@@ -234,16 +234,16 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addUser( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addUser(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		if( ( $userid = Auth::id() ) !== null ) {
-			$context->setUserId( $userid );
+		if (($userid = Auth::id()) !== null) {
+			$context->setUserId($userid);
 		}
 
-		if( ( $user = Auth::user() ) !== null ) {
-			$context->setEditor( $user->name );
+		if (($user = Auth::user()) !== null) {
+			$context->setEditor($user->name);
 		} else {
-			$context->setEditor( \Request::ip() );
+			$context->setEditor(\Request::ip());
 		}
 
 		return $context;
@@ -256,14 +256,14 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addGroups( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addGroups(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		if( ( $userid = Auth::id() ) !== null )
+		if (($userid = Auth::id()) !== null)
 		{
-			$context->setGroupIds( function() use ( $context, $userid )
+			$context->setGroupIds(function() use ($context, $userid)
 			{
-				$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
-				return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups();
+				$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
+				return $manager->getItem($userid, array('customer/group'))->getGroups();
 			} );
 		}
 

src/Aimeos/Shop/Command/JobsCommand.php

Spacing +25 added lines, -25 removed lines

@@ -43,30 +43,30 @@ 
 	 */
 	public function fire()
 	{
-		$aimeos = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get();
+		$aimeos = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get();
 		$context = $this->getContext();
 
 		$process = $context->getProcess();
-		$jobs = explode( ' ', $this->argument( 'jobs' ) );
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
+		$jobs = explode(' ', $this->argument('jobs'));
+		$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->setLanguageId( null );
-			$localeItem->setCurrencyId( null );
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
+			$localeItem->setLanguageId(null);
+			$localeItem->setCurrencyId(null);
 
-			$context->setLocale( $localeItem );
+			$context->setLocale($localeItem);
 
-			$this->info( sprintf( 'Executing the Aimeos jobs for "%s"', $siteItem->getCode() ) );
+			$this->info(sprintf('Executing the Aimeos jobs for "%s"', $siteItem->getCode()));
 
-			foreach( $jobs as $jobname )
+			foreach ($jobs as $jobname)
 			{
-				$fcn = function( $context, $aimeos, $jobname ) {
-					\Aimeos\Controller\Jobs\Factory::createController( $context, $aimeos, $jobname )->run();
+				$fcn = function($context, $aimeos, $jobname) {
+					\Aimeos\Controller\Jobs\Factory::createController($context, $aimeos, $jobname)->run();
 				};
 
-				$process->start( $fcn, [$context, $aimeos, $jobname], true );
+				$process->start($fcn, [$context, $aimeos, $jobname], true);
 			}
 		}
 
@@ -82,8 +82,8 @@ 
 	protected function getArguments()
 	{
 		return array(
-			array( 'jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"' ),
-			array( 'site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)' ),
+			array('jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"'),
+			array('site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)'),
 		);
 	}
 
@@ -106,19 +106,19 @@ 
 	protected function getContext()
 	{
 		$lv = $this->getLaravel();
-		$aimeos = $lv->make( '\Aimeos\Shop\Base\Aimeos' )->get();
-		$context = $lv->make( '\Aimeos\Shop\Base\Context' )->get( false, 'command' );
+		$aimeos = $lv->make('\Aimeos\Shop\Base\Aimeos')->get();
+		$context = $lv->make('\Aimeos\Shop\Base\Context')->get(false, 'command');
 
-		$tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' );
-		$view = $lv->make( '\Aimeos\Shop\Base\View' )->create( $context, $tmplPaths );
+		$tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates');
+		$view = $lv->make('\Aimeos\Shop\Base\View')->create($context, $tmplPaths);
 
-		$langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context )->getSubManager( 'language' );
-		$langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) );
-		$i18n = $lv->make( '\Aimeos\Shop\Base\I18n' )->get( $langids );
+		$langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context)->getSubManager('language');
+		$langids = array_keys($langManager->searchItems($langManager->createSearch(true)));
+		$i18n = $lv->make('\Aimeos\Shop\Base\I18n')->get($langids);
 
-		$context->setEditor( 'aimeos:jobs' );
-		$context->setView( $view );
-		$context->setI18n( $i18n );
+		$context->setEditor('aimeos:jobs');
+		$context->setView($view);
+		$context->setI18n($i18n);
 
 		return $context;
 	}

src/Aimeos/Shop/Controller/JqadmController.php

Doc Comments +4 added lines, -4 removed lines

@@ -75,7 +75,7 @@ 
 	/**
 	 * Returns the HTML code for a copy of a resource object
 	 *
-	 * @return string Generated output
+	 * @return \Illuminate\Contracts\View\View Generated output
 	 */
 	public function copyAction()
 	{
@@ -91,7 +91,7 @@ 
 	/**
 	 * Returns the HTML code for a new resource object
 	 *
-	 * @return string Generated output
+	 * @return \Illuminate\Contracts\View\View Generated output
 	 */
 	public function createAction()
 	{
@@ -128,7 +128,7 @@ 
 	/**
 	 * Returns the HTML code for the requested resource object
 	 *
-	 * @return string Generated output
+	 * @return \Illuminate\Contracts\View\View Generated output
 	 */
 	public function getAction()
 	{
@@ -165,7 +165,7 @@ 
 	/**
 	 * Returns the HTML code for a list of resource objects
 	 *
-	 * @return string Generated output
+	 * @return \Illuminate\Contracts\View\View Generated output
 	 */
 	public function searchAction()
 	{

Spacing +52 added lines, -52 removed lines

@@ -34,38 +34,38 @@ 
 	 */
 	public function fileAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'viewer']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'viewer']]);
 		}
 
 		$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 @@ 
 	 */
 	public function copyAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
 		}
 
 		$cntl = $this->createClient();
-		return $this->getHtml( $cntl->copy() );
+		return $this->getHtml($cntl->copy());
 	}
 
 
@@ -95,12 +95,12 @@ 
 	 */
 	public function createAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
 		}
 
 		$cntl = $this->createClient();
-		return $this->getHtml( $cntl->create() );
+		return $this->getHtml($cntl->create());
 	}
 
 
@@ -111,17 +111,17 @@ 
 	 */
 	public function deleteAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
 		}
 
 		$cntl = $this->createClient();
 
-		if( ( $html = $cntl->delete() ) == '' ) {
+		if (($html = $cntl->delete()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -132,12 +132,12 @@ 
 	 */
 	public function getAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'viewer']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'viewer']]);
 		}
 
 		$cntl = $this->createClient();
-		return $this->getHtml( $cntl->get() );
+		return $this->getHtml($cntl->get());
 	}
 
 
@@ -148,17 +148,17 @@ 
 	 */
 	public function saveAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
 		}
 
 		$cntl = $this->createClient();
 
-		if( ( $html = $cntl->save() ) == '' ) {
+		if (($html = $cntl->save()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -169,12 +169,12 @@ 
 	 */
 	public function searchAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'viewer']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'viewer']]);
 		}
 
 		$cntl = $this->createClient();
-		return $this->getHtml( $cntl->search() );
+		return $this->getHtml($cntl->search());
 	}
 
 
@@ -185,19 +185,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, $templatePaths, $resource )->setAimeos( $aimeos );
+		return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource)->setAimeos($aimeos);
 	}
 
 
@@ -207,15 +207,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/default.php

Spacing +16 added lines, -16 removed lines

@@ -10,16 +10,16 @@ 
 	'uploaddir' => '/',
 
 	'page' => array(
-		'account-index' => array( 'account/profile','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/profile', '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(
@@ -37,17 +37,17 @@ 
 		'fs' => array(
 			'adapter' => 'Standard',
 			'basedir' => public_path(),
-			'tempdir' => storage_path( 'tmp' ),
+			'tempdir' => storage_path('tmp'),
 		),
 		'fs-admin' => array(
 			'adapter' => 'Standard',
-			'basedir' => public_path( 'uploads' ),
-			'tempdir' => storage_path( 'tmp' ),
+			'basedir' => public_path('uploads'),
+			'tempdir' => storage_path('tmp'),
 		),
 		'fs-secure' => array(
 			'adapter' => 'Standard',
-			'basedir' => storage_path( 'secure' ),
-			'tempdir' => storage_path( 'tmp' ),
+			'basedir' => storage_path('secure'),
+			'tempdir' => storage_path('tmp'),
 		),
 		'mq' => array(
 			'adapter' => 'Standard',
@@ -283,7 +283,7 @@ 
 						# in the "maxwidth" parameter
 						# 'maxheight' => 280,
 					),
-					'tempdir' => storage_path( 'aimeos' ),
+					'tempdir' => storage_path('aimeos'),
 				),
 			),
 		),

src/Aimeos/Shop/Controller/AdminController.php

Spacing +10 added lines, -10 removed lines

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

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']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api']]);
 		}
 
-		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', 'viewer']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor', 'viewer']]);
 		}
 
-		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']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api']]);
 		}
 
-		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']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api']]);
 		}
 
-		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']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api']]);
 		}
 
-		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', 'viewer']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor', 'viewer']]);
 		}
 
-		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);
 	}
 }