Inspection of "Use CSS/JS files from CDNs only with SRI" - aimeos/aimeos-laravel - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( ac170c...87d59b )

by Aimeos

created 2017-05-19 10:59 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="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/resources/css/ext-all.css" />
         <link type="text/css" rel="stylesheet" href="https://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="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/adapter/ext/ext-base.js"></script>
         <script type="text/javascript" src="https://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/Base/Page.php 1 patch

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

@@ -53,9 +53,9 @@  discard block
 block discarded – undo
 	 * @param \Aimeos\Shop\Base\Locale $locale Locale object
 	 * @param \Aimeos\Shop\Base\View $view View object
 	 */
-	public function __construct( \Illuminate\Contracts\Config\Repository $config,
+	public function __construct(\Illuminate\Contracts\Config\Repository $config,
 		\Aimeos\Shop\Base\Aimeos $aimeos, \Aimeos\Shop\Base\Context $context,
-		\Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view )
+		\Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view)
 	{
 		$this->config = $config;
 		$this->aimeos = $aimeos;
@@ -71,21 +71,21 @@  discard block
 block discarded – undo
 	 * @param string $pageName Name of the configured page
 	 * @return array Associative list with body and header output separated by client name
 	 */
-	public function getSections( $pageName )
+	public function getSections($pageName)
 	{
 		$context = $this->context->get();
 		$langid = $context->getLocale()->getLanguageId();
-		$tmplPaths = $this->aimeos->get()->getCustomPaths( 'client/html/templates' );
-		$view = $this->view->create( $context, $tmplPaths, $langid );
-		$context->setView( $view );
+		$tmplPaths = $this->aimeos->get()->getCustomPaths('client/html/templates');
+		$view = $this->view->create($context, $tmplPaths, $langid);
+		$context->setView($view);
 
-		$result = array( 'aibody' => array(), 'aiheader' => array() );
-		$page = $context->getConfig()->get( 'page/' . $pageName, array() );
+		$result = array('aibody' => array(), 'aiheader' => array());
+		$page = $context->getConfig()->get('page/'.$pageName, array());
 
-		foreach( (array) $page as $clientName )
+		foreach ((array) $page as $clientName)
 		{
-			$client = \Aimeos\Client\Html\Factory::createClient( $context, $tmplPaths, $clientName );
-			$client->setView( clone $view );
+			$client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName);
+			$client->setView(clone $view);
 			$client->process();
 
 			$result['aibody'][$clientName] = $client->getBody();

Please login to merge, or discard this patch.

src/Aimeos/Shop/Base/Aimeos.php 1 patch

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

@@ -34,7 +34,7 @@  discard block
 block discarded – undo
 	 *
 	 * @param \Illuminate\Contracts\Config\Repository $config Configuration object
 	 */
-	public function __construct( \Illuminate\Contracts\Config\Repository $config )
+	public function __construct(\Illuminate\Contracts\Config\Repository $config)
 	{
 		$this->config = $config;
 	}
@@ -47,16 +47,16 @@  discard block
 block discarded – undo
 	 */
 	public function get()
 	{
-		if( $this->object === null )
+		if ($this->object === null)
 		{
-			$dir = base_path( 'ext' );
+			$dir = base_path('ext');
 
-			if( !is_dir( $dir ) ) {
-				$dir = dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . DIRECTORY_SEPARATOR . 'ext';
+			if (!is_dir($dir)) {
+				$dir = dirname(dirname(dirname(dirname(__DIR__)))).DIRECTORY_SEPARATOR.'ext';
 			}
 
-			$extDirs = (array) $this->config->get( 'shop.extdir', $dir );
-			$this->object = new \Aimeos\Bootstrap( $extDirs, false );
+			$extDirs = (array) $this->config->get('shop.extdir', $dir);
+			$this->object = new \Aimeos\Bootstrap($extDirs, false);
 		}
 
 		return $this->object;
@@ -70,12 +70,12 @@  discard block
 block discarded – undo
 	 */
 	public function getVersion()
 	{
-		if( ( $content = @file_get_contents( base_path( 'composer.lock' ) ) ) !== false
-			&& ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] )
+		if (($content = @file_get_contents(base_path('composer.lock'))) !== false
+			&& ($content = json_decode($content, true)) !== null && isset($content['packages'])
 		) {
-			foreach( (array) $content['packages'] as $item )
+			foreach ((array) $content['packages'] as $item)
 			{
-				if( $item['name'] === 'aimeos/aimeos-laravel' ) {
+				if ($item['name'] === 'aimeos/aimeos-laravel') {
 					return $item['version'];
 				}
 			}

Please login to merge, or discard this patch.

src/default.php 1 patch

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

@@ -8,16 +8,16 @@  discard block
 block discarded – undo
 	'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(
@@ -28,24 +28,24 @@  discard block
 block discarded – undo
 			'database' => env('DB_DATABASE', 'laravel'),
 			'username' => env('DB_USERNAME', 'root'),
 			'password' => env('DB_PASSWORD', ''),
-			'stmt' => array( "SET NAMES 'utf8'", "SET SESSION sql_mode='ANSI'" ),
+			'stmt' => array("SET NAMES 'utf8'", "SET SESSION sql_mode='ANSI'"),
 			'opt-persistent' => 0,
 			'limit' => 2,
 		),
 		'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',
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
 						# in the "maxwidth" parameter
 						# 'maxheight' => 280,
 					),
-					'tempdir' => storage_path( 'aimeos' ),
+					'tempdir' => storage_path('aimeos'),
 				),
 			),
 		),

Please login to merge, or discard this patch.

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

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

@@ -36,13 +36,13 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor']]);
 		}
 
-		return $this->createClient()->get( $request, new Response() );
+		return $this->createClient()->get($request, new Response());
 	}
 
 
@@ -68,13 +68,13 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor']]);
 		}
 
-		return $this->createClient()->options( $request, new Response() );
+		return $this->createClient()->options($request, new Response());
 	}
 
 
@@ -133,18 +133,18 @@  discard block
 block discarded – undo
 	 */
 	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);
 	}
 }

Please login to merge, or discard this patch.

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

Spacing +50 added lines, -50 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', [JqadmController::class, ['admin', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['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', [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 @@  discard block
 block discarded – undo
 	 */
 	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,12 +111,12 @@  discard block
 block discarded – undo
 	 */
 	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();
-		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', [JqadmController::class, ['admin', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['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', [JqadmController::class, ['admin', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['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', [JqadmController::class, ['admin', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
 		}
 
 		$cntl = $this->createClient();
-		return $this->getHtml( $cntl->search() );
+		return $this->getHtml($cntl->search());
 	}
 
 
@@ -175,19 +175,19 @@  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, '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 );
+		return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource);
 	}
 
 
@@ -197,15 +197,15 @@  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)
 	{
-		$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));
 	}
 }

Please login to merge, or discard this patch.

src/Aimeos/Shop/Base/Config.php 1 patch

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

@@ -40,7 +40,7 @@  discard block
 block discarded – undo
 	 * @param \Illuminate\Contracts\Config\Repository $config Configuration object
 	 * @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object
 	 */
-	public function __construct( \Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos )
+	public function __construct(\Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos)
 	{
 		$this->aimeos = $aimeos;
 		$this->config = $config;
@@ -53,23 +53,23 @@  discard block
 block discarded – undo
 	 * @param integer $type Configuration type ("frontend" or "backend")
 	 * @return \Aimeos\MW\Config\Iface Configuration object
 	 */
-	public function get( $type = 'frontend' )
+	public function get($type = 'frontend')
 	{
-		if( !isset( $this->objects[$type] ) )
+		if (!isset($this->objects[$type]))
 		{
 			$configPaths = $this->aimeos->get()->getConfigPaths();
-			$cfgfile = dirname( dirname( dirname( __DIR__ ) ) ) . DIRECTORY_SEPARATOR . 'default.php';
+			$cfgfile = dirname(dirname(dirname(__DIR__))).DIRECTORY_SEPARATOR.'default.php';
 
-			$config = new \Aimeos\MW\Config\PHPArray( require $cfgfile, $configPaths );
+			$config = new \Aimeos\MW\Config\PHPArray(require $cfgfile, $configPaths);
 
-			if( $this->config->get( 'shop.apc_enabled', false ) == true ) {
-				$config = new \Aimeos\MW\Config\Decorator\APC( $config, $this->config->get( 'shop.apc_prefix', 'laravel:' ) );
+			if ($this->config->get('shop.apc_enabled', false) == true) {
+				$config = new \Aimeos\MW\Config\Decorator\APC($config, $this->config->get('shop.apc_prefix', 'laravel:'));
 			}
 
-			$config = new \Aimeos\MW\Config\Decorator\Memory( $config, $this->config->get( 'shop' ) );
+			$config = new \Aimeos\MW\Config\Decorator\Memory($config, $this->config->get('shop'));
 
-			if( ( $conf = $this->config->get( 'shop.' . $type, array() ) ) !== array() ) {
-				$config = new \Aimeos\MW\Config\Decorator\Memory( $config, $conf );
+			if (($conf = $this->config->get('shop.'.$type, array())) !== array()) {
+				$config = new \Aimeos\MW\Config\Decorator\Memory($config, $conf);
 			}
 
 			$this->objects[$type] = $config;

Please login to merge, or discard this patch.

src/Aimeos/Shop/Base/I18n.php 1 patch

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

@@ -40,7 +40,7 @@  discard block
 block discarded – undo
 	 * @param \Illuminate\Contracts\Config\Repository $config Configuration object
 	 * @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object
 	 */
-	public function __construct( \Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos )
+	public function __construct(\Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos)
 	{
 		$this->aimeos = $aimeos;
 		$this->config = $config;
@@ -53,22 +53,22 @@  discard block
 block discarded – undo
 	 * @param array $languageIds List of two letter ISO language IDs
 	 * @return \Aimeos\MW\Translation\Iface[] List of translation objects
 	 */
-	public function get( array $languageIds )
+	public function get(array $languageIds)
 	{
 		$i18nPaths = $this->aimeos->get()->getI18nPaths();
 
-		foreach( $languageIds as $langid )
+		foreach ($languageIds as $langid)
 		{
-			if( !isset( $this->i18n[$langid] ) )
+			if (!isset($this->i18n[$langid]))
 			{
-				$i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $langid );
+				$i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $langid);
 
-				if( $this->config->get( 'shop.apc_enabled', false ) == true ) {
-					$i18n = new \Aimeos\MW\Translation\Decorator\APC( $i18n, $this->config->get( 'shop.apc_prefix', 'laravel:' ) );
+				if ($this->config->get('shop.apc_enabled', false) == true) {
+					$i18n = new \Aimeos\MW\Translation\Decorator\APC($i18n, $this->config->get('shop.apc_prefix', 'laravel:'));
 				}
 
-				if( $this->config->has( 'shop.i18n.' . $langid ) ) {
-					$i18n = new \Aimeos\MW\Translation\Decorator\Memory( $i18n, $this->config->get( 'shop.i18n.' . $langid ) );
+				if ($this->config->has('shop.i18n.'.$langid)) {
+					$i18n = new \Aimeos\MW\Translation\Decorator\Memory($i18n, $this->config->get('shop.i18n.'.$langid));
 				}
 
 				$this->i18n[$langid] = $i18n;

Please login to merge, or discard this patch.

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

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

@@ -31,9 +31,9 @@  discard block
 block discarded – undo
 	 * @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)
 	{
-		return $this->createClient()->delete( $request, new Response() );
+		return $this->createClient()->delete($request, new Response());
 	}
 
 
@@ -43,9 +43,9 @@  discard block
 block discarded – undo
 	 * @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)
 	{
-		return $this->createClient()->get( $request, new Response() );
+		return $this->createClient()->get($request, new Response());
 	}
 
 
@@ -55,9 +55,9 @@  discard block
 block discarded – undo
 	 * @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)
 	{
-		return $this->createClient()->patch( $request, new Response() );
+		return $this->createClient()->patch($request, new Response());
 	}
 
 
@@ -67,9 +67,9 @@  discard block
 block discarded – undo
 	 * @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)
 	{
-		return $this->createClient()->post( $request, new Response() );
+		return $this->createClient()->post($request, new Response());
 	}
 
 
@@ -79,9 +79,9 @@  discard block
 block discarded – undo
 	 * @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)
 	{
-		return $this->createClient()->put( $request, new Response() );
+		return $this->createClient()->put($request, new Response());
 	}
 
 
@@ -91,9 +91,9 @@  discard block
 block discarded – undo
 	 * @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)
 	{
-		return $this->createClient()->options( $request, new Response() );
+		return $this->createClient()->options($request, new Response());
 	}
 
 
@@ -104,17 +104,17 @@  discard block
 block discarded – undo
 	 */
 	protected function createClient()
 	{
-		$resource = Route::input( 'resource' );
-		$related = Route::input( 'related', Input::get( 'related' ) );
+		$resource = Route::input('resource');
+		$related = Route::input('related', Input::get('related'));
 
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
-		$tmplPaths = $aimeos->getCustomPaths( 'client/jsonapi/templates' );
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
+		$tmplPaths = $aimeos->getCustomPaths('client/jsonapi/templates');
 
-		$context = app( '\Aimeos\Shop\Base\Context' )->get();
+		$context = app('\Aimeos\Shop\Base\Context')->get();
 		$langid = $context->getLocale()->getLanguageId();
 
-		$context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $tmplPaths, $langid ) );
+		$context->setView(app('\Aimeos\Shop\Base\View')->create($context, $tmplPaths, $langid));
 
-		return \Aimeos\Client\JsonApi\Factory::createClient( $context, $tmplPaths, $resource . '/' . $related );
+		return \Aimeos\Client\JsonApi\Factory::createClient($context, $tmplPaths, $resource.'/'.$related);
 	}
 }

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="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/resources/css/ext-all.css" />
10	10	<link type="text/css" rel="stylesheet" href="https://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="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/adapter/ext/ext-base.js"></script>
47	47	<script type="text/javascript" src="https://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>

		@@ -53,9 +53,9 @@ discard block
		block discarded – undo
53	53	* @param \Aimeos\Shop\Base\Locale $locale Locale object
54	54	* @param \Aimeos\Shop\Base\View $view View object
55	55	*/
56		- public function __construct( \Illuminate\Contracts\Config\Repository $config,
	56	+ public function __construct(\Illuminate\Contracts\Config\Repository $config,
57	57	\Aimeos\Shop\Base\Aimeos $aimeos, \Aimeos\Shop\Base\Context $context,
58		- \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view )
	58	+ \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view)
59	59	{
60	60	$this->config = $config;
61	61	$this->aimeos = $aimeos;
		@@ -71,21 +71,21 @@ discard block
		block discarded – undo
71	71	* @param string $pageName Name of the configured page
72	72	* @return array Associative list with body and header output separated by client name
73	73	*/
74		- public function getSections( $pageName )
	74	+ public function getSections($pageName)
75	75	{
76	76	$context = $this->context->get();
77	77	$langid = $context->getLocale()->getLanguageId();
78		- $tmplPaths = $this->aimeos->get()->getCustomPaths( 'client/html/templates' );
79		- $view = $this->view->create( $context, $tmplPaths, $langid );
80		- $context->setView( $view );
	78	+ $tmplPaths = $this->aimeos->get()->getCustomPaths('client/html/templates');
	79	+ $view = $this->view->create($context, $tmplPaths, $langid);
	80	+ $context->setView($view);
81	81
82		- $result = array( 'aibody' => array(), 'aiheader' => array() );
83		- $page = $context->getConfig()->get( 'page/' . $pageName, array() );
	82	+ $result = array('aibody' => array(), 'aiheader' => array());
	83	+ $page = $context->getConfig()->get('page/'.$pageName, array());
84	84
85		- foreach( (array) $page as $clientName )
	85	+ foreach ((array) $page as $clientName)
86	86	{
87		- $client = \Aimeos\Client\Html\Factory::createClient( $context, $tmplPaths, $clientName );
88		- $client->setView( clone $view );
	87	+ $client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName);
	88	+ $client->setView(clone $view);
89	89	$client->process();
90	90
91	91	$result['aibody'][$clientName] = $client->getBody();

		@@ -34,7 +34,7 @@ discard block
		block discarded – undo
34	34	*
35	35	* @param \Illuminate\Contracts\Config\Repository $config Configuration object
36	36	*/
37		- public function __construct( \Illuminate\Contracts\Config\Repository $config )
	37	+ public function __construct(\Illuminate\Contracts\Config\Repository $config)
38	38	{
39	39	$this->config = $config;
40	40	}
		@@ -47,16 +47,16 @@ discard block
		block discarded – undo
47	47	*/
48	48	public function get()
49	49	{
50		- if( $this->object === null )
	50	+ if ($this->object === null)
51	51	{
52		- $dir = base_path( 'ext' );
	52	+ $dir = base_path('ext');
53	53
54		- if( !is_dir( $dir ) ) {
55		- $dir = dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . DIRECTORY_SEPARATOR . 'ext';
	54	+ if (!is_dir($dir)) {
	55	+ $dir = dirname(dirname(dirname(dirname(__DIR__)))).DIRECTORY_SEPARATOR.'ext';
56	56	}
57	57
58		- $extDirs = (array) $this->config->get( 'shop.extdir', $dir );
59		- $this->object = new \Aimeos\Bootstrap( $extDirs, false );
	58	+ $extDirs = (array) $this->config->get('shop.extdir', $dir);
	59	+ $this->object = new \Aimeos\Bootstrap($extDirs, false);
60	60	}
61	61
62	62	return $this->object;
		@@ -70,12 +70,12 @@ discard block
		block discarded – undo
70	70	*/
71	71	public function getVersion()
72	72	{
73		- if( ( $content = @file_get_contents( base_path( 'composer.lock' ) ) ) !== false
74		- && ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] )
	73	+ if (($content = @file_get_contents(base_path('composer.lock'))) !== false
	74	+ && ($content = json_decode($content, true)) !== null && isset($content['packages'])
75	75	) {
76		- foreach( (array) $content['packages'] as $item )
	76	+ foreach ((array) $content['packages'] as $item)
77	77	{
78		- if( $item['name'] === 'aimeos/aimeos-laravel' ) {
	78	+ if ($item['name'] === 'aimeos/aimeos-laravel') {
79	79	return $item['version'];
80	80	}
81	81	}

		@@ -8,16 +8,16 @@ discard block
		block discarded – undo
8	8	'uploaddir' => '/',
9	9
10	10	'page' => array(
11		- 'account-index' => array( 'account/profile','account/history','account/favorite','account/watch','basket/mini','catalog/session' ),
12		- 'basket-index' => array( 'basket/standard','basket/related' ),
13		- 'catalog-count' => array( 'catalog/count' ),
14		- 'catalog-detail' => array( 'basket/mini','catalog/stage','catalog/detail','catalog/session' ),
15		- 'catalog-list' => array( 'basket/mini','catalog/filter','catalog/stage','catalog/lists' ),
16		- 'catalog-stock' => array( 'catalog/stock' ),
17		- 'catalog-suggest' => array( 'catalog/suggest' ),
18		- 'checkout-confirm' => array( 'checkout/confirm' ),
19		- 'checkout-index' => array( 'checkout/standard' ),
20		- 'checkout-update' => array( 'checkout/update'),
	11	+ 'account-index' => array('account/profile', 'account/history', 'account/favorite', 'account/watch', 'basket/mini', 'catalog/session'),
	12	+ 'basket-index' => array('basket/standard', 'basket/related'),
	13	+ 'catalog-count' => array('catalog/count'),
	14	+ 'catalog-detail' => array('basket/mini', 'catalog/stage', 'catalog/detail', 'catalog/session'),
	15	+ 'catalog-list' => array('basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists'),
	16	+ 'catalog-stock' => array('catalog/stock'),
	17	+ 'catalog-suggest' => array('catalog/suggest'),
	18	+ 'checkout-confirm' => array('checkout/confirm'),
	19	+ 'checkout-index' => array('checkout/standard'),
	20	+ 'checkout-update' => array('checkout/update'),
21	21	),
22	22
23	23	'resource' => array(
		@@ -28,24 +28,24 @@ discard block
		block discarded – undo
28	28	'database' => env('DB_DATABASE', 'laravel'),
29	29	'username' => env('DB_USERNAME', 'root'),
30	30	'password' => env('DB_PASSWORD', ''),
31		- 'stmt' => array( "SET NAMES 'utf8'", "SET SESSION sql_mode='ANSI'" ),
	31	+ 'stmt' => array("SET NAMES 'utf8'", "SET SESSION sql_mode='ANSI'"),
32	32	'opt-persistent' => 0,
33	33	'limit' => 2,
34	34	),
35	35	'fs' => array(
36	36	'adapter' => 'Standard',
37	37	'basedir' => public_path(),
38		- 'tempdir' => storage_path( 'tmp' ),
	38	+ 'tempdir' => storage_path('tmp'),
39	39	),
40	40	'fs-admin' => array(
41	41	'adapter' => 'Standard',
42		- 'basedir' => public_path( 'uploads' ),
43		- 'tempdir' => storage_path( 'tmp' ),
	42	+ 'basedir' => public_path('uploads'),
	43	+ 'tempdir' => storage_path('tmp'),
44	44	),
45	45	'fs-secure' => array(
46	46	'adapter' => 'Standard',
47		- 'basedir' => storage_path( 'secure' ),
48		- 'tempdir' => storage_path( 'tmp' ),
	47	+ 'basedir' => storage_path('secure'),
	48	+ 'tempdir' => storage_path('tmp'),
49	49	),
50	50	'mq' => array(
51	51	'adapter' => 'Standard',
		@@ -267,7 +267,7 @@ discard block
		block discarded – undo
267	267	# in the "maxwidth" parameter
268	268	# 'maxheight' => 280,
269	269	),
270		- 'tempdir' => storage_path( 'aimeos' ),
	270	+ 'tempdir' => storage_path('aimeos'),
271	271	),
272	272	),
273	273	),

		@@ -36,13 +36,13 @@ discard block
		block discarded – undo
36	36	* @param \Psr\Http\Message\ServerRequestInterface $request Request object
37	37	* @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
38	38	*/
39		- public function deleteAction( ServerRequestInterface $request )
	39	+ public function deleteAction(ServerRequestInterface $request)
40	40	{
41		- if( config( 'shop.authorize', true ) ) {
42		- $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] );
	41	+ if (config('shop.authorize', true)) {
	42	+ $this->authorize('admin', [JsonadmController::class, ['admin', 'api']]);
43	43	}
44	44
45		- return $this->createClient()->delete( $request, new Response() );
	45	+ return $this->createClient()->delete($request, new Response());
46	46	}
47	47
48	48
		@@ -52,13 +52,13 @@ discard block
		block discarded – undo
52	52	* @param \Psr\Http\Message\ServerRequestInterface $request Request object
53	53	* @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
54	54	*/
55		- public function getAction( ServerRequestInterface $request )
	55	+ public function getAction(ServerRequestInterface $request)
56	56	{
57		- if( config( 'shop.authorize', true ) ) {
58		- $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'editor']] );
	57	+ if (config('shop.authorize', true)) {
	58	+ $this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor']]);
59	59	}
60	60
61		- return $this->createClient()->get( $request, new Response() );
	61	+ return $this->createClient()->get($request, new Response());
62	62	}
63	63
64	64
		@@ -68,13 +68,13 @@ discard block
		block discarded – undo
68	68	* @param \Psr\Http\Message\ServerRequestInterface $request Request object
69	69	* @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
70	70	*/
71		- public function patchAction( ServerRequestInterface $request )
	71	+ public function patchAction(ServerRequestInterface $request)
72	72	{
73		- if( config( 'shop.authorize', true ) ) {
74		- $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] );
	73	+ if (config('shop.authorize', true)) {
	74	+ $this->authorize('admin', [JsonadmController::class, ['admin', 'api']]);
75	75	}
76	76
77		- return $this->createClient()->patch( $request, new Response() );
	77	+ return $this->createClient()->patch($request, new Response());
78	78	}
79	79
80	80
		@@ -84,13 +84,13 @@ discard block
		block discarded – undo
84	84	* @param \Psr\Http\Message\ServerRequestInterface $request Request object
85	85	* @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
86	86	*/
87		- public function postAction( ServerRequestInterface $request )
	87	+ public function postAction(ServerRequestInterface $request)
88	88	{
89		- if( config( 'shop.authorize', true ) ) {
90		- $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] );
	89	+ if (config('shop.authorize', true)) {
	90	+ $this->authorize('admin', [JsonadmController::class, ['admin', 'api']]);
91	91	}
92	92
93		- return $this->createClient()->post( $request, new Response() );
	93	+ return $this->createClient()->post($request, new Response());
94	94	}
95	95
96	96
		@@ -100,13 +100,13 @@ discard block
		block discarded – undo
100	100	* @param \Psr\Http\Message\ServerRequestInterface $request Request object
101	101	* @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
102	102	*/
103		- public function putAction( ServerRequestInterface $request )
	103	+ public function putAction(ServerRequestInterface $request)
104	104	{
105		- if( config( 'shop.authorize', true ) ) {
106		- $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] );
	105	+ if (config('shop.authorize', true)) {
	106	+ $this->authorize('admin', [JsonadmController::class, ['admin', 'api']]);
107	107	}
108	108
109		- return $this->createClient()->put( $request, new Response() );
	109	+ return $this->createClient()->put($request, new Response());
110	110	}
111	111
112	112
		@@ -116,13 +116,13 @@ discard block
		block discarded – undo
116	116	* @param \Psr\Http\Message\ServerRequestInterface $request Request object
117	117	* @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
118	118	*/
119		- public function optionsAction( ServerRequestInterface $request )
	119	+ public function optionsAction(ServerRequestInterface $request)
120	120	{
121		- if( config( 'shop.authorize', true ) ) {
122		- $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'editor']] );
	121	+ if (config('shop.authorize', true)) {
	122	+ $this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor']]);
123	123	}
124	124
125		- return $this->createClient()->options( $request, new Response() );
	125	+ return $this->createClient()->options($request, new Response());
126	126	}
127	127
128	128
		@@ -133,18 +133,18 @@ discard block
		block discarded – undo
133	133	*/
134	134	protected function createClient()
135	135	{
136		- $site = Route::input( 'site', Input::get( 'site', 'default' ) );
137		- $lang = Input::get( 'locale', config( 'app.locale', 'en' ) );
138		- $resource = Route::input( 'resource' );
	136	+ $site = Route::input('site', Input::get('site', 'default'));
	137	+ $lang = Input::get('locale', config('app.locale', 'en'));
	138	+ $resource = Route::input('resource');
139	139
140		- $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
141		- $templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' );
	140	+ $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
	141	+ $templatePaths = $aimeos->getCustomPaths('admin/jsonadm/templates');
142	142
143		- $context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' );
144		- $context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang, 'en' ) ) );
145		- $context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) );
146		- $context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $templatePaths, $lang ) );
	143	+ $context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend');
	144	+ $context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en')));
	145	+ $context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site));
	146	+ $context->setView(app('\Aimeos\Shop\Base\View')->create($context, $templatePaths, $lang));
147	147
148		- return \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, $resource );
	148	+ return \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, $resource);
149	149	}
150	150	}

		@@ -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', [JqadmController::class, ['admin', 'editor']] );
	37	+ if (config('shop.authorize', true)) {
	38	+ $this->authorize('admin', [JqadmController::class, ['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', [JqadmController::class, ['admin', 'editor']] );
	82	+ if (config('shop.authorize', true)) {
	83	+ $this->authorize('admin', [JqadmController::class, ['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', [JqadmController::class, ['admin', 'editor']] );
	98	+ if (config('shop.authorize', true)) {
	99	+ $this->authorize('admin', [JqadmController::class, ['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', [JqadmController::class, ['admin', 'editor']] );
	114	+ if (config('shop.authorize', true)) {
	115	+ $this->authorize('admin', [JqadmController::class, ['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', [JqadmController::class, ['admin', 'editor']] );
	130	+ if (config('shop.authorize', true)) {
	131	+ $this->authorize('admin', [JqadmController::class, ['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', [JqadmController::class, ['admin', 'editor']] );
	146	+ if (config('shop.authorize', true)) {
	147	+ $this->authorize('admin', [JqadmController::class, ['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', [JqadmController::class, ['admin', 'editor']] );
	162	+ if (config('shop.authorize', true)) {
	163	+ $this->authorize('admin', [JqadmController::class, ['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,19 +175,19 @@ 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, 'backend' );
186		- $context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang, 'en' ) ) );
187		- $context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) );
188		- $context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $templatePaths, $lang ) );
	185	+ $context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend');
	186	+ $context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en')));
	187	+ $context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site));
	188	+ $context->setView(app('\Aimeos\Shop\Base\View')->create($context, $templatePaths, $lang));
189	189
190		- return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource );
	190	+ return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource);
191	191	}
192	192
193	193
		@@ -197,15 +197,15 @@ discard block
		block discarded – undo
197	197	* @param string $content Content from admin client
198	198	* @return \Illuminate\Contracts\View\View View for rendering the output
199	199	*/
200		- protected function getHtml( $content )
	200	+ protected function getHtml($content)
201	201	{
202		- $aimeos = app( '\Aimeos\Shop\Base\Aimeos' );
203		- $extnames = implode( ',', $aimeos->get()->getExtensions() );
	202	+ $aimeos = app('\Aimeos\Shop\Base\Aimeos');
	203	+ $extnames = implode(',', $aimeos->get()->getExtensions());
204	204	$version = $aimeos->getVersion();
205	205
206		- $site = Route::input( 'site', Input::get( 'site', 'default' ) );
207		- $content = str_replace( ['{type}', '{version}', '{extensions}'], ['Laravel', $version, $extnames], $content );
	206	+ $site = Route::input('site', Input::get('site', 'default'));
	207	+ $content = str_replace(['{type}', '{version}', '{extensions}'], ['Laravel', $version, $extnames], $content);
208	208
209		- return View::make( 'shop::jqadm.index', array( 'content' => $content, 'site' => $site ) );
	209	+ return View::make('shop::jqadm.index', array('content' => $content, 'site' => $site));
210	210	}
211	211	}

		@@ -40,7 +40,7 @@ discard block
		block discarded – undo
40	40	* @param \Illuminate\Contracts\Config\Repository $config Configuration object
41	41	* @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object
42	42	*/
43		- public function __construct( \Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos )
	43	+ public function __construct(\Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos)
44	44	{
45	45	$this->aimeos = $aimeos;
46	46	$this->config = $config;
		@@ -53,23 +53,23 @@ discard block
		block discarded – undo
53	53	* @param integer $type Configuration type ("frontend" or "backend")
54	54	* @return \Aimeos\MW\Config\Iface Configuration object
55	55	*/
56		- public function get( $type = 'frontend' )
	56	+ public function get($type = 'frontend')
57	57	{
58		- if( !isset( $this->objects[$type] ) )
	58	+ if (!isset($this->objects[$type]))
59	59	{
60	60	$configPaths = $this->aimeos->get()->getConfigPaths();
61		- $cfgfile = dirname( dirname( dirname( __DIR__ ) ) ) . DIRECTORY_SEPARATOR . 'default.php';
	61	+ $cfgfile = dirname(dirname(dirname(__DIR__))).DIRECTORY_SEPARATOR.'default.php';
62	62
63		- $config = new \Aimeos\MW\Config\PHPArray( require $cfgfile, $configPaths );
	63	+ $config = new \Aimeos\MW\Config\PHPArray(require $cfgfile, $configPaths);
64	64
65		- if( $this->config->get( 'shop.apc_enabled', false ) == true ) {
66		- $config = new \Aimeos\MW\Config\Decorator\APC( $config, $this->config->get( 'shop.apc_prefix', 'laravel:' ) );
	65	+ if ($this->config->get('shop.apc_enabled', false) == true) {
	66	+ $config = new \Aimeos\MW\Config\Decorator\APC($config, $this->config->get('shop.apc_prefix', 'laravel:'));
67	67	}
68	68
69		- $config = new \Aimeos\MW\Config\Decorator\Memory( $config, $this->config->get( 'shop' ) );
	69	+ $config = new \Aimeos\MW\Config\Decorator\Memory($config, $this->config->get('shop'));
70	70
71		- if( ( $conf = $this->config->get( 'shop.' . $type, array() ) ) !== array() ) {
72		- $config = new \Aimeos\MW\Config\Decorator\Memory( $config, $conf );
	71	+ if (($conf = $this->config->get('shop.'.$type, array())) !== array()) {
	72	+ $config = new \Aimeos\MW\Config\Decorator\Memory($config, $conf);
73	73	}
74	74
75	75	$this->objects[$type] = $config;

		@@ -31,9 +31,9 @@ discard block
		block discarded – undo
31	31	* @param \Psr\Http\Message\ServerRequestInterface $request Request object
32	32	* @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
33	33	*/
34		- public function deleteAction( ServerRequestInterface $request )
	34	+ public function deleteAction(ServerRequestInterface $request)
35	35	{
36		- return $this->createClient()->delete( $request, new Response() );
	36	+ return $this->createClient()->delete($request, new Response());
37	37	}
38	38
39	39
		@@ -43,9 +43,9 @@ discard block
		block discarded – undo
43	43	* @param \Psr\Http\Message\ServerRequestInterface $request Request object
44	44	* @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
45	45	*/
46		- public function getAction( ServerRequestInterface $request )
	46	+ public function getAction(ServerRequestInterface $request)
47	47	{
48		- return $this->createClient()->get( $request, new Response() );
	48	+ return $this->createClient()->get($request, new Response());
49	49	}
50	50
51	51
		@@ -55,9 +55,9 @@ discard block
		block discarded – undo
55	55	* @param \Psr\Http\Message\ServerRequestInterface $request Request object
56	56	* @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
57	57	*/
58		- public function patchAction( ServerRequestInterface $request )
	58	+ public function patchAction(ServerRequestInterface $request)
59	59	{
60		- return $this->createClient()->patch( $request, new Response() );
	60	+ return $this->createClient()->patch($request, new Response());
61	61	}
62	62
63	63
		@@ -67,9 +67,9 @@ discard block
		block discarded – undo
67	67	* @param \Psr\Http\Message\ServerRequestInterface $request Request object
68	68	* @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
69	69	*/
70		- public function postAction( ServerRequestInterface $request )
	70	+ public function postAction(ServerRequestInterface $request)
71	71	{
72		- return $this->createClient()->post( $request, new Response() );
	72	+ return $this->createClient()->post($request, new Response());
73	73	}
74	74
75	75
		@@ -79,9 +79,9 @@ discard block
		block discarded – undo
79	79	* @param \Psr\Http\Message\ServerRequestInterface $request Request object
80	80	* @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
81	81	*/
82		- public function putAction( ServerRequestInterface $request )
	82	+ public function putAction(ServerRequestInterface $request)
83	83	{
84		- return $this->createClient()->put( $request, new Response() );
	84	+ return $this->createClient()->put($request, new Response());
85	85	}
86	86
87	87
		@@ -91,9 +91,9 @@ discard block
		block discarded – undo
91	91	* @param \Psr\Http\Message\ServerRequestInterface $request Request object
92	92	* @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
93	93	*/
94		- public function optionsAction( ServerRequestInterface $request )
	94	+ public function optionsAction(ServerRequestInterface $request)
95	95	{
96		- return $this->createClient()->options( $request, new Response() );
	96	+ return $this->createClient()->options($request, new Response());
97	97	}
98	98
99	99
		@@ -104,17 +104,17 @@ discard block
		block discarded – undo
104	104	*/
105	105	protected function createClient()
106	106	{
107		- $resource = Route::input( 'resource' );
108		- $related = Route::input( 'related', Input::get( 'related' ) );
	107	+ $resource = Route::input('resource');
	108	+ $related = Route::input('related', Input::get('related'));
109	109
110		- $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
111		- $tmplPaths = $aimeos->getCustomPaths( 'client/jsonapi/templates' );
	110	+ $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
	111	+ $tmplPaths = $aimeos->getCustomPaths('client/jsonapi/templates');
112	112
113		- $context = app( '\Aimeos\Shop\Base\Context' )->get();
	113	+ $context = app('\Aimeos\Shop\Base\Context')->get();
114	114	$langid = $context->getLocale()->getLanguageId();
115	115
116		- $context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $tmplPaths, $langid ) );
	116	+ $context->setView(app('\Aimeos\Shop\Base\View')->create($context, $tmplPaths, $langid));
117	117
118		- return \Aimeos\Client\JsonApi\Factory::createClient( $context, $tmplPaths, $resource . '/' . $related );
	118	+ return \Aimeos\Client\JsonApi\Factory::createClient($context, $tmplPaths, $resource.'/'.$related);
119	119	}
120	120	}

aimeos / aimeos-laravel

Push — master ( ac170c...87d59b )

Status

Category

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

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

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

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

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

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

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

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

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