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

@@ -106,12 +106,12 @@
 block discarded – undo
 		});
 
 
-		$this->commands( array(
+		$this->commands(array(
 			'Aimeos\Shop\Command\AccountCommand',
 			'Aimeos\Shop\Command\CacheCommand',
 			'Aimeos\Shop\Command\SetupCommand',
 			'Aimeos\Shop\Command\JobsCommand',
-		) );
+		));
 	}
 
 

Please login to merge, or discard this patch.

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

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

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

Please login to merge, or discard this patch.

src/views/extadm/index.blade.php 1 patch

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/View.php 2 patches

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

@@ -209,8 +209,7 @@
 block discarded – undo
 		{
 			$i18n = $this->i18n->get( array( $locale ) );
 			$translation = $i18n[$locale];
-		}
-		else
+		} else
 		{
 			$translation = new \Aimeos\MW\Translation\None( 'en' );
 		}

Please login to merge, or discard this patch.

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

@@ -41,7 +41,7 @@  discard block
 block discarded – undo
 	 * @param \Aimeos\Shop\Base\I18n $i18n I18n object
 	 * @param \Aimeos\Shop\Base\Support $support Support object
 	 */
-	public function __construct( \Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support )
+	public function __construct(\Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support)
 	{
 		$this->i18n = $i18n;
 		$this->support = $support;
@@ -56,21 +56,21 @@  discard block
 block discarded – undo
 	 * @param string|null $locale Code of the current language or null for no translation
 	 * @return \Aimeos\MW\View\Iface View object
 	 */
-	public function create( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null )
+	public function create(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null)
 	{
-		$engine = new \Aimeos\MW\View\Engine\Blade( app( 'Illuminate\Contracts\View\Factory' ) );
-		$view = new \Aimeos\MW\View\Standard( $templatePaths, array( '.blade.php' => $engine ) );
+		$engine = new \Aimeos\MW\View\Engine\Blade(app('Illuminate\Contracts\View\Factory'));
+		$view = new \Aimeos\MW\View\Standard($templatePaths, array('.blade.php' => $engine));
 		$config = $context->getConfig();
 
-		$this->addCsrf( $view );
-		$this->addAccess( $view, $context );
-		$this->addConfig( $view, $config );
-		$this->addNumber( $view, $config );
-		$this->addParam( $view );
-		$this->addRequest( $view );
-		$this->addResponse( $view );
-		$this->addTranslate( $view, $locale );
-		$this->addUrl( $view );
+		$this->addCsrf($view);
+		$this->addAccess($view, $context);
+		$this->addConfig($view, $config);
+		$this->addNumber($view, $config);
+		$this->addParam($view);
+		$this->addRequest($view);
+		$this->addResponse($view);
+		$this->addTranslate($view, $locale);
+		$this->addUrl($view);
 
 		return $view;
 	}
@@ -83,16 +83,16 @@  discard block
 block discarded – undo
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addAccess( \Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addAccess(\Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$support = $this->support;
 
-		$fcn = function() use ( $support, $context ) {
-			return $support->getGroups( $context );
+		$fcn = function() use ($support, $context) {
+			return $support->getGroups($context);
 		};
 
-		$helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn );
-		$view->addHelper( 'access', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Access\Standard($view, $fcn);
+		$view->addHelper('access', $helper);
 
 		return $view;
 	}
@@ -105,11 +105,11 @@  discard block
 block discarded – undo
 	 * @param \Aimeos\MW\Config\Iface $config Configuration object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addConfig( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config )
+	protected function addConfig(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config)
 	{
-		$config = new \Aimeos\MW\Config\Decorator\Protect( clone $config, array( 'admin', 'client' ) );
-		$helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config );
-		$view->addHelper( 'config', $helper );
+		$config = new \Aimeos\MW\Config\Decorator\Protect(clone $config, array('admin', 'client'));
+		$helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config);
+		$view->addHelper('config', $helper);
 
 		return $view;
 	}
@@ -121,10 +121,10 @@  discard block
 block discarded – undo
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addCsrf( \Aimeos\MW\View\Iface $view )
+	protected function addCsrf(\Aimeos\MW\View\Iface $view)
 	{
-		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', csrf_token() );
-		$view->addHelper( 'csrf', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', csrf_token());
+		$view->addHelper('csrf', $helper);
 
 		return $view;
 	}
@@ -137,14 +137,14 @@  discard block
 block discarded – undo
 	 * @param \Aimeos\MW\Config\Iface $config Configuration object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addNumber( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config )
+	protected function addNumber(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config)
 	{
-		$sepDec = $config->get( 'client/html/common/format/separatorDecimal', '.' );
-		$sep1000 = $config->get( 'client/html/common/format/separator1000', ' ' );
-		$decimals = $config->get( 'client/html/common/format/decimals', 2 );
+		$sepDec = $config->get('client/html/common/format/separatorDecimal', '.');
+		$sep1000 = $config->get('client/html/common/format/separator1000', ' ');
+		$decimals = $config->get('client/html/common/format/decimals', 2);
 
-		$helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000, $decimals );
-		$view->addHelper( 'number', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000, $decimals);
+		$view->addHelper('number', $helper);
 
 		return $view;
 	}
@@ -156,11 +156,11 @@  discard block
 block discarded – undo
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addParam( \Aimeos\MW\View\Iface $view )
+	protected function addParam(\Aimeos\MW\View\Iface $view)
 	{
-		$params = ( Route::current() ? Route::current()->parameters() : array() ) + Input::all();
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params );
-		$view->addHelper( 'param', $helper );
+		$params = (Route::current() ? Route::current()->parameters() : array()) + Input::all();
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params);
+		$view->addHelper('param', $helper);
 
 		return $view;
 	}
@@ -172,10 +172,10 @@  discard block
 block discarded – undo
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addRequest( \Aimeos\MW\View\Iface $view )
+	protected function addRequest(\Aimeos\MW\View\Iface $view)
 	{
-		$helper = new \Aimeos\MW\View\Helper\Request\Laravel5( $view, Request::instance() );
-		$view->addHelper( 'request', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Request\Laravel5($view, Request::instance());
+		$view->addHelper('request', $helper);
 
 		return $view;
 	}
@@ -187,10 +187,10 @@  discard block
 block discarded – undo
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addResponse( \Aimeos\MW\View\Iface $view )
+	protected function addResponse(\Aimeos\MW\View\Iface $view)
 	{
-		$helper = new \Aimeos\MW\View\Helper\Response\Laravel5( $view );
-		$view->addHelper( 'response', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Response\Laravel5($view);
+		$view->addHelper('response', $helper);
 
 		return $view;
 	}
@@ -203,20 +203,20 @@  discard block
 block discarded – undo
 	 * @param string|null $locale ISO language code, e.g. "de" or "de_CH"
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addTranslate( \Aimeos\MW\View\Iface $view, $locale )
+	protected function addTranslate(\Aimeos\MW\View\Iface $view, $locale)
 	{
-		if( $locale !== null )
+		if ($locale !== null)
 		{
-			$i18n = $this->i18n->get( array( $locale ) );
+			$i18n = $this->i18n->get(array($locale));
 			$translation = $i18n[$locale];
 		}
 		else
 		{
-			$translation = new \Aimeos\MW\Translation\None( 'en' );
+			$translation = new \Aimeos\MW\Translation\None('en');
 		}
 
-		$helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation );
-		$view->addHelper( 'translate', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation);
+		$view->addHelper('translate', $helper);
 
 		return $view;
 	}
@@ -228,27 +228,27 @@  discard block
 block discarded – undo
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addUrl( \Aimeos\MW\View\Iface $view )
+	protected function addUrl(\Aimeos\MW\View\Iface $view)
 	{
 		$fixed = array();
 
-		if( Route::current() )
+		if (Route::current())
 		{
-			if( ( $value = Route::input( 'site' ) ) !== null ) {
+			if (($value = Route::input('site')) !== null) {
 				$fixed['site'] = $value;
 			}
 
-			if( ( $value = Route::input( 'locale' ) ) !== null ) {
+			if (($value = Route::input('locale')) !== null) {
 				$fixed['locale'] = $value;
 			}
 
-			if( ( $value = Route::input( 'currency' ) ) !== null ) {
+			if (($value = Route::input('currency')) !== null) {
 				$fixed['currency'] = $value;
 			}
 		}
 
-		$helper = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, app('url'), $fixed );
-		$view->addHelper( 'url', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Url\Laravel5($view, app('url'), $fixed);
+		$view->addHelper('url', $helper);
 
 		return $view;
 	}

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/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.

		@@ -106,12 +106,12 @@
		block discarded – undo
106	106	});
107	107
108	108
109		- $this->commands( array(
	109	+ $this->commands(array(
110	110	'Aimeos\Shop\Command\AccountCommand',
111	111	'Aimeos\Shop\Command\CacheCommand',
112	112	'Aimeos\Shop\Command\SetupCommand',
113	113	'Aimeos\Shop\Command\JobsCommand',
114		- ) );
	114	+ ));
115	115	}
116	116
117	117

		@@ -209,8 +209,7 @@
		block discarded – undo
209	209	{
210	210	$i18n = $this->i18n->get( array( $locale ) );
211	211	$translation = $i18n[$locale];
212		- }
213		- else
	212	+ } else
214	213	{
215	214	$translation = new \Aimeos\MW\Translation\None( 'en' );
216	215	}

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

		@@ -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>

		@@ -41,7 +41,7 @@ discard block
		block discarded – undo
41	41	* @param \Aimeos\Shop\Base\I18n $i18n I18n object
42	42	* @param \Aimeos\Shop\Base\Support $support Support object
43	43	*/
44		- public function __construct( \Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support )
	44	+ public function __construct(\Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support)
45	45	{
46	46	$this->i18n = $i18n;
47	47	$this->support = $support;
		@@ -56,21 +56,21 @@ discard block
		block discarded – undo
56	56	* @param string\|null $locale Code of the current language or null for no translation
57	57	* @return \Aimeos\MW\View\Iface View object
58	58	*/
59		- public function create( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null )
	59	+ public function create(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null)
60	60	{
61		- $engine = new \Aimeos\MW\View\Engine\Blade( app( 'Illuminate\Contracts\View\Factory' ) );
62		- $view = new \Aimeos\MW\View\Standard( $templatePaths, array( '.blade.php' => $engine ) );
	61	+ $engine = new \Aimeos\MW\View\Engine\Blade(app('Illuminate\Contracts\View\Factory'));
	62	+ $view = new \Aimeos\MW\View\Standard($templatePaths, array('.blade.php' => $engine));
63	63	$config = $context->getConfig();
64	64
65		- $this->addCsrf( $view );
66		- $this->addAccess( $view, $context );
67		- $this->addConfig( $view, $config );
68		- $this->addNumber( $view, $config );
69		- $this->addParam( $view );
70		- $this->addRequest( $view );
71		- $this->addResponse( $view );
72		- $this->addTranslate( $view, $locale );
73		- $this->addUrl( $view );
	65	+ $this->addCsrf($view);
	66	+ $this->addAccess($view, $context);
	67	+ $this->addConfig($view, $config);
	68	+ $this->addNumber($view, $config);
	69	+ $this->addParam($view);
	70	+ $this->addRequest($view);
	71	+ $this->addResponse($view);
	72	+ $this->addTranslate($view, $locale);
	73	+ $this->addUrl($view);
74	74
75	75	return $view;
76	76	}
		@@ -83,16 +83,16 @@ discard block
		block discarded – undo
83	83	* @param \Aimeos\MShop\Context\Item\Iface $context Context object
84	84	* @return \Aimeos\MW\View\Iface Modified view object
85	85	*/
86		- protected function addAccess( \Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context )
	86	+ protected function addAccess(\Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context)
87	87	{
88	88	$support = $this->support;
89	89
90		- $fcn = function() use ( $support, $context ) {
91		- return $support->getGroups( $context );
	90	+ $fcn = function() use ($support, $context) {
	91	+ return $support->getGroups($context);
92	92	};
93	93
94		- $helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn );
95		- $view->addHelper( 'access', $helper );
	94	+ $helper = new \Aimeos\MW\View\Helper\Access\Standard($view, $fcn);
	95	+ $view->addHelper('access', $helper);
96	96
97	97	return $view;
98	98	}
		@@ -105,11 +105,11 @@ discard block
		block discarded – undo
105	105	* @param \Aimeos\MW\Config\Iface $config Configuration object
106	106	* @return \Aimeos\MW\View\Iface Modified view object
107	107	*/
108		- protected function addConfig( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config )
	108	+ protected function addConfig(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config)
109	109	{
110		- $config = new \Aimeos\MW\Config\Decorator\Protect( clone $config, array( 'admin', 'client' ) );
111		- $helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config );
112		- $view->addHelper( 'config', $helper );
	110	+ $config = new \Aimeos\MW\Config\Decorator\Protect(clone $config, array('admin', 'client'));
	111	+ $helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config);
	112	+ $view->addHelper('config', $helper);
113	113
114	114	return $view;
115	115	}
		@@ -121,10 +121,10 @@ discard block
		block discarded – undo
121	121	* @param \Aimeos\MW\View\Iface $view View object
122	122	* @return \Aimeos\MW\View\Iface Modified view object
123	123	*/
124		- protected function addCsrf( \Aimeos\MW\View\Iface $view )
	124	+ protected function addCsrf(\Aimeos\MW\View\Iface $view)
125	125	{
126		- $helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', csrf_token() );
127		- $view->addHelper( 'csrf', $helper );
	126	+ $helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', csrf_token());
	127	+ $view->addHelper('csrf', $helper);
128	128
129	129	return $view;
130	130	}
		@@ -137,14 +137,14 @@ discard block
		block discarded – undo
137	137	* @param \Aimeos\MW\Config\Iface $config Configuration object
138	138	* @return \Aimeos\MW\View\Iface Modified view object
139	139	*/
140		- protected function addNumber( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config )
	140	+ protected function addNumber(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config)
141	141	{
142		- $sepDec = $config->get( 'client/html/common/format/separatorDecimal', '.' );
143		- $sep1000 = $config->get( 'client/html/common/format/separator1000', ' ' );
144		- $decimals = $config->get( 'client/html/common/format/decimals', 2 );
	142	+ $sepDec = $config->get('client/html/common/format/separatorDecimal', '.');
	143	+ $sep1000 = $config->get('client/html/common/format/separator1000', ' ');
	144	+ $decimals = $config->get('client/html/common/format/decimals', 2);
145	145
146		- $helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000, $decimals );
147		- $view->addHelper( 'number', $helper );
	146	+ $helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000, $decimals);
	147	+ $view->addHelper('number', $helper);
148	148
149	149	return $view;
150	150	}
		@@ -156,11 +156,11 @@ discard block
		block discarded – undo
156	156	* @param \Aimeos\MW\View\Iface $view View object
157	157	* @return \Aimeos\MW\View\Iface Modified view object
158	158	*/
159		- protected function addParam( \Aimeos\MW\View\Iface $view )
	159	+ protected function addParam(\Aimeos\MW\View\Iface $view)
160	160	{
161		- $params = ( Route::current() ? Route::current()->parameters() : array() ) + Input::all();
162		- $helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params );
163		- $view->addHelper( 'param', $helper );
	161	+ $params = (Route::current() ? Route::current()->parameters() : array()) + Input::all();
	162	+ $helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params);
	163	+ $view->addHelper('param', $helper);
164	164
165	165	return $view;
166	166	}
		@@ -172,10 +172,10 @@ discard block
		block discarded – undo
172	172	* @param \Aimeos\MW\View\Iface $view View object
173	173	* @return \Aimeos\MW\View\Iface Modified view object
174	174	*/
175		- protected function addRequest( \Aimeos\MW\View\Iface $view )
	175	+ protected function addRequest(\Aimeos\MW\View\Iface $view)
176	176	{
177		- $helper = new \Aimeos\MW\View\Helper\Request\Laravel5( $view, Request::instance() );
178		- $view->addHelper( 'request', $helper );
	177	+ $helper = new \Aimeos\MW\View\Helper\Request\Laravel5($view, Request::instance());
	178	+ $view->addHelper('request', $helper);
179	179
180	180	return $view;
181	181	}
		@@ -187,10 +187,10 @@ discard block
		block discarded – undo
187	187	* @param \Aimeos\MW\View\Iface $view View object
188	188	* @return \Aimeos\MW\View\Iface Modified view object
189	189	*/
190		- protected function addResponse( \Aimeos\MW\View\Iface $view )
	190	+ protected function addResponse(\Aimeos\MW\View\Iface $view)
191	191	{
192		- $helper = new \Aimeos\MW\View\Helper\Response\Laravel5( $view );
193		- $view->addHelper( 'response', $helper );
	192	+ $helper = new \Aimeos\MW\View\Helper\Response\Laravel5($view);
	193	+ $view->addHelper('response', $helper);
194	194
195	195	return $view;
196	196	}
		@@ -203,20 +203,20 @@ discard block
		block discarded – undo
203	203	* @param string\|null $locale ISO language code, e.g. "de" or "de_CH"
204	204	* @return \Aimeos\MW\View\Iface Modified view object
205	205	*/
206		- protected function addTranslate( \Aimeos\MW\View\Iface $view, $locale )
	206	+ protected function addTranslate(\Aimeos\MW\View\Iface $view, $locale)
207	207	{
208		- if( $locale !== null )
	208	+ if ($locale !== null)
209	209	{
210		- $i18n = $this->i18n->get( array( $locale ) );
	210	+ $i18n = $this->i18n->get(array($locale));
211	211	$translation = $i18n[$locale];
212	212	}
213	213	else
214	214	{
215		- $translation = new \Aimeos\MW\Translation\None( 'en' );
	215	+ $translation = new \Aimeos\MW\Translation\None('en');
216	216	}
217	217
218		- $helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation );
219		- $view->addHelper( 'translate', $helper );
	218	+ $helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation);
	219	+ $view->addHelper('translate', $helper);
220	220
221	221	return $view;
222	222	}
		@@ -228,27 +228,27 @@ discard block
		block discarded – undo
228	228	* @param \Aimeos\MW\View\Iface $view View object
229	229	* @return \Aimeos\MW\View\Iface Modified view object
230	230	*/
231		- protected function addUrl( \Aimeos\MW\View\Iface $view )
	231	+ protected function addUrl(\Aimeos\MW\View\Iface $view)
232	232	{
233	233	$fixed = array();
234	234
235		- if( Route::current() )
	235	+ if (Route::current())
236	236	{
237		- if( ( $value = Route::input( 'site' ) ) !== null ) {
	237	+ if (($value = Route::input('site')) !== null) {
238	238	$fixed['site'] = $value;
239	239	}
240	240
241		- if( ( $value = Route::input( 'locale' ) ) !== null ) {
	241	+ if (($value = Route::input('locale')) !== null) {
242	242	$fixed['locale'] = $value;
243	243	}
244	244
245		- if( ( $value = Route::input( 'currency' ) ) !== null ) {
	245	+ if (($value = Route::input('currency')) !== null) {
246	246	$fixed['currency'] = $value;
247	247	}
248	248	}
249	249
250		- $helper = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, app('url'), $fixed );
251		- $view->addHelper( 'url', $helper );
	250	+ $helper = new \Aimeos\MW\View\Helper\Url\Laravel5($view, app('url'), $fixed);
	251	+ $view->addHelper('url', $helper);
252	252
253	253	return $view;
254	254	}

		@@ -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	}

		@@ -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;

aimeos / aimeos-laravel

Push — master ( ac170c...87d59b )

Status

Category

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

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

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

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +54 added lines, -54 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 +10 added lines, -10 removed lines patch added patch discarded remove patch