Inspection of "Compatibility to Laravel 5.4 auth" - aimeos/aimeos-laravel - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 4f506c...6daf04 )

by Aimeos

created 2017-01-28 11:01 UTC

Status

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

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

Please login to merge, or discard this patch.

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

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

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

Please login to merge, or discard this patch.

src/default.php 1 patch

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

@@ -4,20 +4,20 @@  discard block
 block discarded – undo
 
 	'apc_enabled' => false,
 	'apc_prefix' => 'laravel:',
-	'extdir' => ( is_dir(base_path('ext')) ? base_path('ext') : dirname(__DIR__) . DIRECTORY_SEPARATOR . 'ext' ),
+	'extdir' => (is_dir(base_path('ext')) ? base_path('ext') : dirname(__DIR__).DIRECTORY_SEPARATOR.'ext'),
 	'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/Base/Context.php 1 patch

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

@@ -55,7 +55,7 @@  discard block
 block discarded – undo
 	 * @param \Aimeos\Shop\Base\Locale $locale Locale object
 	 * @param \Aimeos\Shop\Base\I18n $i18n Internationalisation object
 	 */
-	public function __construct( \Illuminate\Session\Store $session, \Aimeos\Shop\Base\Config $config, \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\I18n $i18n )
+	public function __construct(\Illuminate\Session\Store $session, \Aimeos\Shop\Base\Config $config, \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\I18n $i18n)
 	{
 		$this->session = $session;
 		$this->config = $config;
@@ -71,35 +71,35 @@  discard block
 block discarded – undo
 	 * @param string $type Configuration type, i.e. "frontend" or "backend" (deprecated, use \Aimeos\Shop\Base\Config)
 	 * @return \Aimeos\MShop\Context\Item\Iface Context object
 	 */
-	public function get( $locale = true, $type = 'frontend' )
+	public function get($locale = true, $type = 'frontend')
 	{
-		$config = $this->config->get( $type );
+		$config = $this->config->get($type);
 
-		if( $this->context === null )
+		if ($this->context === null)
 		{
 			$context = new \Aimeos\MShop\Context\Item\Standard();
-			$context->setConfig( $config );
-
-			$this->addDataBaseManager( $context );
-			$this->addFilesystemManager( $context );
-			$this->addMessageQueueManager( $context );
-			$this->addLogger( $context );
-			$this->addCache( $context );
-			$this->addMailer( $context);
-			$this->addSession( $context );
-			$this->addUser( $context);
-			$this->addGroups( $context);
+			$context->setConfig($config);
+
+			$this->addDataBaseManager($context);
+			$this->addFilesystemManager($context);
+			$this->addMessageQueueManager($context);
+			$this->addLogger($context);
+			$this->addCache($context);
+			$this->addMailer($context);
+			$this->addSession($context);
+			$this->addUser($context);
+			$this->addGroups($context);
 
 			$this->context = $context;
 		}
 
-		$this->context->setConfig( $config );
+		$this->context->setConfig($config);
 
-		if( $locale === true )
+		if ($locale === true)
 		{
-			$localeItem = $this->locale->get( $this->context );
-			$this->context->setLocale( $localeItem );
-			$this->context->setI18n( $this->i18n->get( array( $localeItem->getLanguageId() ) ) );
+			$localeItem = $this->locale->get($this->context);
+			$this->context->setLocale($localeItem);
+			$this->context->setI18n($this->i18n->get(array($localeItem->getLanguageId())));
 		}
 
 		return $this->context;
@@ -112,10 +112,10 @@  discard block
 block discarded – undo
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object including config
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addCache( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addCache(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context );
-		$context->setCache( $cache );
+		$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context);
+		$context->setCache($cache);
 
 		return $context;
 	}
@@ -127,10 +127,10 @@  discard block
 block discarded – undo
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addDatabaseManager( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addDatabaseManager(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$dbm = new \Aimeos\MW\DB\Manager\DBAL( $context->getConfig() );
-		$context->setDatabaseManager( $dbm );
+		$dbm = new \Aimeos\MW\DB\Manager\DBAL($context->getConfig());
+		$context->setDatabaseManager($dbm);
 
 		return $context;
 	}
@@ -142,13 +142,13 @@  discard block
 block discarded – undo
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addFilesystemManager( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addFilesystemManager(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$config = $context->getConfig();
-		$path = storage_path( 'aimeos' );
+		$path = storage_path('aimeos');
 
-		$fs = new \Aimeos\MW\Filesystem\Manager\Laravel( app( 'filesystem' ), $config, $path );
-		$context->setFilesystemManager( $fs );
+		$fs = new \Aimeos\MW\Filesystem\Manager\Laravel(app('filesystem'), $config, $path);
+		$context->setFilesystemManager($fs);
 
 		return $context;
 	}
@@ -160,10 +160,10 @@  discard block
 block discarded – undo
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addLogger( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addLogger(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager( $context );
-		$context->setLogger( $logger );
+		$logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager($context);
+		$context->setLogger($logger);
 
 		return $context;
 	}
@@ -176,10 +176,10 @@  discard block
 block discarded – undo
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addMailer( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addMailer(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$mail = new \Aimeos\MW\Mail\Swift( function() { return app( 'mailer' )->getSwiftMailer(); } );
-		$context->setMail( $mail );
+		$mail = new \Aimeos\MW\Mail\Swift(function() { return app('mailer')->getSwiftMailer(); } );
+		$context->setMail($mail);
 
 		return $context;
 	}
@@ -191,10 +191,10 @@  discard block
 block discarded – undo
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addMessageQueueManager( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addMessageQueueManager(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$mq = new \Aimeos\MW\MQueue\Manager\Standard( $context->getConfig() );
-		$context->setMessageQueueManager( $mq );
+		$mq = new \Aimeos\MW\MQueue\Manager\Standard($context->getConfig());
+		$context->setMessageQueueManager($mq);
 
 		return $context;
 	}
@@ -206,10 +206,10 @@  discard block
 block discarded – undo
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addSession( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addSession(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$session = new \Aimeos\MW\Session\Laravel5( $this->session );
-		$context->setSession( $session );
+		$session = new \Aimeos\MW\Session\Laravel5($this->session);
+		$context->setSession($session);
 
 		return $context;
 	}
@@ -221,14 +221,14 @@  discard block
 block discarded – undo
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addUser( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addUser(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		if( ( $userid = Auth::id() ) !== null ) {
-			$context->setUserId( $userid );
+		if (($userid = Auth::id()) !== null) {
+			$context->setUserId($userid);
 		}
 
-		if( ( $user = Auth::user() ) !== null ) {
-			$context->setEditor( $user->name );
+		if (($user = Auth::user()) !== null) {
+			$context->setEditor($user->name);
 		}
 
 		return $context;
@@ -241,14 +241,14 @@  discard block
 block discarded – undo
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addGroups( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addGroups(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		if( ( $userid = Auth::id() ) !== null )
+		if (($userid = Auth::id()) !== null)
 		{
-			$context->setGroupIds( function() use ( $context, $userid )
+			$context->setGroupIds(function() use ($context, $userid)
 			{
-				$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
-				return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups();
+				$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
+				return $manager->getItem($userid, array('customer/group'))->getGroups();
 			} );
 		}
 

Please login to merge, or discard this patch.

src/Aimeos/Shop/Base/Locale.php 2 patches

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

@@ -207,8 +207,7 @@
 block discarded – undo
 			$localeItem = $localeManager->bootstrap( $sitecode, '', '', false );
 			$localeItem->setLanguageId( null );
 			$localeItem->setCurrencyId( null );
-		}
-		catch( \Aimeos\MShop\Locale\Exception $e )
+		} catch( \Aimeos\MShop\Locale\Exception $e )
 		{
 			$localeItem = $localeManager->createItem();
 		}

Please login to merge, or discard this patch.

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

@@ -38,7 +38,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;
 	}
@@ -50,25 +50,25 @@  discard block
 block discarded – undo
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item object
 	 */
-	public function get( \Aimeos\MShop\Context\Item\Iface $context )
+	public function get(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		if( $this->locale === null )
+		if ($this->locale === null)
 		{
-			$site = Input::get( 'site', 'default' );
-			$currency = Input::get( 'currency', '' );
-			$lang = Input::get( 'locale', '' );
+			$site = Input::get('site', 'default');
+			$currency = Input::get('currency', '');
+			$lang = Input::get('locale', '');
 
-			if( Route::current() )
+			if (Route::current())
 			{
-				$site =  Route::input( 'site', $site );
-				$currency = Route::input( 'currency', $currency );
-				$lang = Route::input( 'locale', $lang );
+				$site = Route::input('site', $site);
+				$currency = Route::input('currency', $currency);
+				$lang = Route::input('locale', $lang);
 			}
 
-			$disableSites = $this->config->get( 'shop.disableSites', true );
+			$disableSites = $this->config->get('shop.disableSites', true);
 
-			$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
-			$this->locale = $localeManager->bootstrap( $site, $lang, $currency, $disableSites );
+			$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
+			$this->locale = $localeManager->bootstrap($site, $lang, $currency, $disableSites);
 		}
 
 		return $this->locale;
@@ -82,17 +82,17 @@  discard block
 block discarded – undo
 	 * @param string $site Unique site code
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item object
 	 */
-	public function getBackend( \Aimeos\MShop\Context\Item\Iface $context, $site )
+	public function getBackend(\Aimeos\MShop\Context\Item\Iface $context, $site)
 	{
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
 
 		try
 		{
-			$localeItem = $localeManager->bootstrap( $site, '', '', false );
-			$localeItem->setLanguageId( null );
-			$localeItem->setCurrencyId( null );
+			$localeItem = $localeManager->bootstrap($site, '', '', false);
+			$localeItem->setLanguageId(null);
+			$localeItem->setCurrencyId(null);
 		}
-		catch( \Aimeos\MShop\Locale\Exception $e )
+		catch (\Aimeos\MShop\Locale\Exception $e)
 		{
 			$localeItem = $localeManager->createItem();
 		}

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( function_exists( 'apc_store' ) === true && $this->config->get( 'shop.apc_enabled', false ) == true ) {
-					$i18n = new \Aimeos\MW\Translation\Decorator\APC( $i18n, $this->config->get( 'shop.apc_prefix', 'laravel:' ) );
+				if (function_exists('apc_store') === true && $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/Base/Page.php 1 patch

Spacing +12 added lines, -12 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,23 +71,23 @@  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);
 
-		$pagesConfig = $this->config->get( 'shop.page', array() );
-		$result = array( 'aibody' => array(), 'aiheader' => array() );
+		$pagesConfig = $this->config->get('shop.page', array());
+		$result = array('aibody' => array(), 'aiheader' => array());
 
-		if( isset( $pagesConfig[$pageName] ) )
+		if (isset($pagesConfig[$pageName]))
 		{
-			foreach( (array) $pagesConfig[$pageName] as $clientName )
+			foreach ((array) $pagesConfig[$pageName] 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/Support.php 1 patch

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

@@ -39,7 +39,7 @@  discard block
 block discarded – undo
 	 * @param \Aimeos\Shop\Base\Context $context Context provider
 	 * @param \Aimeos\Shop\Base\Locale $locale Locale provider
 	 */
-	public function __construct( \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale )
+	public function __construct(\Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale)
 	{
 		$this->context = $context;
 		$this->locale = $locale;
@@ -53,45 +53,45 @@  discard block
 block discarded – undo
 	 * @param string|array $groupcodes Unique user/customer group codes that are allowed
 	 * @return boolean True if user is part of the group, false if not
 	 */
-	public function checkGroup( $userid, $groupcodes )
+	public function checkGroup($userid, $groupcodes)
 	{
-		$site = ( Route::current() ? Route::input( 'site', Input::get( 'site', 'default' ) ) : 'default' );
+		$site = (Route::current() ? Route::input('site', Input::get('site', 'default')) : 'default');
 
-		$context = $this->context->get( false );
-		$context->setLocale( $this->locale->getBackend( $context, $site ) );
+		$context = $this->context->get(false);
+		$context->setLocale($this->locale->getBackend($context, $site));
 
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.group.code', (array) $groupcodes ) );
-		$groupItems = $manager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'customer.group.code', (array) $groupcodes));
+		$groupItems = $manager->searchItems($search);
 
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'customer.lists.parentid', $userid ),
-			$search->compare( '==', 'customer.lists.refid', array_keys( $groupItems ) ),
-			$search->compare( '==', 'customer.lists.domain', 'customer/group' ),
+			$search->compare('==', 'customer.lists.parentid', $userid),
+			$search->compare('==', 'customer.lists.refid', array_keys($groupItems)),
+			$search->compare('==', 'customer.lists.domain', 'customer/group'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 1);
 
-		return (bool) count( $manager->searchItems( $search ) );
+		return (bool) count($manager->searchItems($search));
 	}
 
 
-	public function getGroups( \Aimeos\MShop\Context\Item\Iface $context )
+	public function getGroups(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$list = array();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.group.id', $context->getGroupIds() ) );
+		$search->setConditions($search->compare('==', 'customer.group.id', $context->getGroupIds()));
 
-		foreach( $manager->searchItems( $search ) as $item ) {
+		foreach ($manager->searchItems($search) as $item) {
 			$list[] = $item->getCode();
 		}
 

Please login to merge, or discard this patch.

src/Aimeos/Shop/Command/JobsCommand.php 1 patch

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

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

Please login to merge, or discard this patch.

		@@ -207,8 +207,7 @@
		block discarded – undo
207	207	$localeItem = $localeManager->bootstrap( $sitecode, '', '', false );
208	208	$localeItem->setLanguageId( null );
209	209	$localeItem->setCurrencyId( null );
210		- }
211		- catch( \Aimeos\MShop\Locale\Exception $e )
	210	+ } catch( \Aimeos\MShop\Locale\Exception $e )
212	211	{
213	212	$localeItem = $localeManager->createItem();
214	213	}

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

		@@ -30,7 +30,7 @@ discard block
		block discarded – undo
30	30	*/
31	31	public function indexAction()
32	32	{
33		- $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'account-index' );
	33	+ $params = app('\Aimeos\Shop\Base\Page')->getSections('account-index');
34	34	return View::make('shop::account.index', $params);
35	35	}
36	36
		@@ -42,17 +42,17 @@ discard block
		block discarded – undo
42	42	*/
43	43	public function downloadAction()
44	44	{
45		- $context = app( '\Aimeos\Shop\Base\Context' )->get();
	45	+ $context = app('\Aimeos\Shop\Base\Context')->get();
46	46	$langid = $context->getLocale()->getLanguageId();
47	47
48		- $view = app( '\Aimeos\Shop\Base\View' )->create( $context, array(), $langid );
49		- $context->setView( $view );
	48	+ $view = app('\Aimeos\Shop\Base\View')->create($context, array(), $langid);
	49	+ $context->setView($view);
50	50
51		- $client = \Aimeos\Client\Html\Factory::createClient( $context, array(), 'account/download' );
52		- $client->setView( $view );
	51	+ $client = \Aimeos\Client\Html\Factory::createClient($context, array(), 'account/download');
	52	+ $client->setView($view);
53	53	$client->process();
54	54
55	55	$response = $view->response();
56		- return Response::make( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() );
	56	+ return Response::make((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders());
57	57	}
58	58	}
59	59	\ No newline at end of file

		@@ -4,20 +4,20 @@ discard block
		block discarded – undo
4	4
5	5	'apc_enabled' => false,
6	6	'apc_prefix' => 'laravel:',
7		- 'extdir' => ( is_dir(base_path('ext')) ? base_path('ext') : dirname(__DIR__) . DIRECTORY_SEPARATOR . 'ext' ),
	7	+ 'extdir' => (is_dir(base_path('ext')) ? base_path('ext') : dirname(__DIR__).DIRECTORY_SEPARATOR.'ext'),
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	),

		@@ -55,7 +55,7 @@ discard block
		block discarded – undo
55	55	* @param \Aimeos\Shop\Base\Locale $locale Locale object
56	56	* @param \Aimeos\Shop\Base\I18n $i18n Internationalisation object
57	57	*/
58		- public function __construct( \Illuminate\Session\Store $session, \Aimeos\Shop\Base\Config $config, \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\I18n $i18n )
	58	+ public function __construct(\Illuminate\Session\Store $session, \Aimeos\Shop\Base\Config $config, \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\I18n $i18n)
59	59	{
60	60	$this->session = $session;
61	61	$this->config = $config;
		@@ -71,35 +71,35 @@ discard block
		block discarded – undo
71	71	* @param string $type Configuration type, i.e. "frontend" or "backend" (deprecated, use \Aimeos\Shop\Base\Config)
72	72	* @return \Aimeos\MShop\Context\Item\Iface Context object
73	73	*/
74		- public function get( $locale = true, $type = 'frontend' )
	74	+ public function get($locale = true, $type = 'frontend')
75	75	{
76		- $config = $this->config->get( $type );
	76	+ $config = $this->config->get($type);
77	77
78		- if( $this->context === null )
	78	+ if ($this->context === null)
79	79	{
80	80	$context = new \Aimeos\MShop\Context\Item\Standard();
81		- $context->setConfig( $config );
82		-
83		- $this->addDataBaseManager( $context );
84		- $this->addFilesystemManager( $context );
85		- $this->addMessageQueueManager( $context );
86		- $this->addLogger( $context );
87		- $this->addCache( $context );
88		- $this->addMailer( $context);
89		- $this->addSession( $context );
90		- $this->addUser( $context);
91		- $this->addGroups( $context);
	81	+ $context->setConfig($config);
	82	+
	83	+ $this->addDataBaseManager($context);
	84	+ $this->addFilesystemManager($context);
	85	+ $this->addMessageQueueManager($context);
	86	+ $this->addLogger($context);
	87	+ $this->addCache($context);
	88	+ $this->addMailer($context);
	89	+ $this->addSession($context);
	90	+ $this->addUser($context);
	91	+ $this->addGroups($context);
92	92
93	93	$this->context = $context;
94	94	}
95	95
96		- $this->context->setConfig( $config );
	96	+ $this->context->setConfig($config);
97	97
98		- if( $locale === true )
	98	+ if ($locale === true)
99	99	{
100		- $localeItem = $this->locale->get( $this->context );
101		- $this->context->setLocale( $localeItem );
102		- $this->context->setI18n( $this->i18n->get( array( $localeItem->getLanguageId() ) ) );
	100	+ $localeItem = $this->locale->get($this->context);
	101	+ $this->context->setLocale($localeItem);
	102	+ $this->context->setI18n($this->i18n->get(array($localeItem->getLanguageId())));
103	103	}
104	104
105	105	return $this->context;
		@@ -112,10 +112,10 @@ discard block
		block discarded – undo
112	112	* @param \Aimeos\MShop\Context\Item\Iface $context Context object including config
113	113	* @return \Aimeos\MShop\Context\Item\Iface Modified context object
114	114	*/
115		- protected function addCache( \Aimeos\MShop\Context\Item\Iface $context )
	115	+ protected function addCache(\Aimeos\MShop\Context\Item\Iface $context)
116	116	{
117		- $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context );
118		- $context->setCache( $cache );
	117	+ $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context);
	118	+ $context->setCache($cache);
119	119
120	120	return $context;
121	121	}
		@@ -127,10 +127,10 @@ discard block
		block discarded – undo
127	127	* @param \Aimeos\MShop\Context\Item\Iface $context Context object
128	128	* @return \Aimeos\MShop\Context\Item\Iface Modified context object
129	129	*/
130		- protected function addDatabaseManager( \Aimeos\MShop\Context\Item\Iface $context )
	130	+ protected function addDatabaseManager(\Aimeos\MShop\Context\Item\Iface $context)
131	131	{
132		- $dbm = new \Aimeos\MW\DB\Manager\DBAL( $context->getConfig() );
133		- $context->setDatabaseManager( $dbm );
	132	+ $dbm = new \Aimeos\MW\DB\Manager\DBAL($context->getConfig());
	133	+ $context->setDatabaseManager($dbm);
134	134
135	135	return $context;
136	136	}
		@@ -142,13 +142,13 @@ discard block
		block discarded – undo
142	142	* @param \Aimeos\MShop\Context\Item\Iface $context Context object
143	143	* @return \Aimeos\MShop\Context\Item\Iface Modified context object
144	144	*/
145		- protected function addFilesystemManager( \Aimeos\MShop\Context\Item\Iface $context )
	145	+ protected function addFilesystemManager(\Aimeos\MShop\Context\Item\Iface $context)
146	146	{
147	147	$config = $context->getConfig();
148		- $path = storage_path( 'aimeos' );
	148	+ $path = storage_path('aimeos');
149	149
150		- $fs = new \Aimeos\MW\Filesystem\Manager\Laravel( app( 'filesystem' ), $config, $path );
151		- $context->setFilesystemManager( $fs );
	150	+ $fs = new \Aimeos\MW\Filesystem\Manager\Laravel(app('filesystem'), $config, $path);
	151	+ $context->setFilesystemManager($fs);
152	152
153	153	return $context;
154	154	}
		@@ -160,10 +160,10 @@ discard block
		block discarded – undo
160	160	* @param \Aimeos\MShop\Context\Item\Iface $context Context object
161	161	* @return \Aimeos\MShop\Context\Item\Iface Modified context object
162	162	*/
163		- protected function addLogger( \Aimeos\MShop\Context\Item\Iface $context )
	163	+ protected function addLogger(\Aimeos\MShop\Context\Item\Iface $context)
164	164	{
165		- $logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager( $context );
166		- $context->setLogger( $logger );
	165	+ $logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager($context);
	166	+ $context->setLogger($logger);
167	167
168	168	return $context;
169	169	}
		@@ -176,10 +176,10 @@ discard block
		block discarded – undo
176	176	* @param \Aimeos\MShop\Context\Item\Iface $context Context object
177	177	* @return \Aimeos\MShop\Context\Item\Iface Modified context object
178	178	*/
179		- protected function addMailer( \Aimeos\MShop\Context\Item\Iface $context )
	179	+ protected function addMailer(\Aimeos\MShop\Context\Item\Iface $context)
180	180	{
181		- $mail = new \Aimeos\MW\Mail\Swift( function() { return app( 'mailer' )->getSwiftMailer(); } );
182		- $context->setMail( $mail );
	181	+ $mail = new \Aimeos\MW\Mail\Swift(function() { return app('mailer')->getSwiftMailer(); } );
	182	+ $context->setMail($mail);
183	183
184	184	return $context;
185	185	}
		@@ -191,10 +191,10 @@ discard block
		block discarded – undo
191	191	* @param \Aimeos\MShop\Context\Item\Iface $context Context object
192	192	* @return \Aimeos\MShop\Context\Item\Iface Modified context object
193	193	*/
194		- protected function addMessageQueueManager( \Aimeos\MShop\Context\Item\Iface $context )
	194	+ protected function addMessageQueueManager(\Aimeos\MShop\Context\Item\Iface $context)
195	195	{
196		- $mq = new \Aimeos\MW\MQueue\Manager\Standard( $context->getConfig() );
197		- $context->setMessageQueueManager( $mq );
	196	+ $mq = new \Aimeos\MW\MQueue\Manager\Standard($context->getConfig());
	197	+ $context->setMessageQueueManager($mq);
198	198
199	199	return $context;
200	200	}
		@@ -206,10 +206,10 @@ discard block
		block discarded – undo
206	206	* @param \Aimeos\MShop\Context\Item\Iface $context Context object
207	207	* @return \Aimeos\MShop\Context\Item\Iface Modified context object
208	208	*/
209		- protected function addSession( \Aimeos\MShop\Context\Item\Iface $context )
	209	+ protected function addSession(\Aimeos\MShop\Context\Item\Iface $context)
210	210	{
211		- $session = new \Aimeos\MW\Session\Laravel5( $this->session );
212		- $context->setSession( $session );
	211	+ $session = new \Aimeos\MW\Session\Laravel5($this->session);
	212	+ $context->setSession($session);
213	213
214	214	return $context;
215	215	}
		@@ -221,14 +221,14 @@ discard block
		block discarded – undo
221	221	* @param \Aimeos\MShop\Context\Item\Iface $context Context object
222	222	* @return \Aimeos\MShop\Context\Item\Iface Modified context object
223	223	*/
224		- protected function addUser( \Aimeos\MShop\Context\Item\Iface $context )
	224	+ protected function addUser(\Aimeos\MShop\Context\Item\Iface $context)
225	225	{
226		- if( ( $userid = Auth::id() ) !== null ) {
227		- $context->setUserId( $userid );
	226	+ if (($userid = Auth::id()) !== null) {
	227	+ $context->setUserId($userid);
228	228	}
229	229
230		- if( ( $user = Auth::user() ) !== null ) {
231		- $context->setEditor( $user->name );
	230	+ if (($user = Auth::user()) !== null) {
	231	+ $context->setEditor($user->name);
232	232	}
233	233
234	234	return $context;
		@@ -241,14 +241,14 @@ discard block
		block discarded – undo
241	241	* @param \Aimeos\MShop\Context\Item\Iface $context Context object
242	242	* @return \Aimeos\MShop\Context\Item\Iface Modified context object
243	243	*/
244		- protected function addGroups( \Aimeos\MShop\Context\Item\Iface $context )
	244	+ protected function addGroups(\Aimeos\MShop\Context\Item\Iface $context)
245	245	{
246		- if( ( $userid = Auth::id() ) !== null )
	246	+ if (($userid = Auth::id()) !== null)
247	247	{
248		- $context->setGroupIds( function() use ( $context, $userid )
	248	+ $context->setGroupIds(function() use ($context, $userid)
249	249	{
250		- $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
251		- return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups();
	250	+ $manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
	251	+ return $manager->getItem($userid, array('customer/group'))->getGroups();
252	252	} );
253	253	}
254	254

		@@ -38,7 +38,7 @@ discard block
		block discarded – undo
38	38	*
39	39	* @param \Illuminate\Contracts\Config\Repository $config Configuration object
40	40	*/
41		- public function __construct( \Illuminate\Contracts\Config\Repository $config )
	41	+ public function __construct(\Illuminate\Contracts\Config\Repository $config)
42	42	{
43	43	$this->config = $config;
44	44	}
		@@ -50,25 +50,25 @@ discard block
		block discarded – undo
50	50	* @param \Aimeos\MShop\Context\Item\Iface $context Context object
51	51	* @return \Aimeos\MShop\Locale\Item\Iface Locale item object
52	52	*/
53		- public function get( \Aimeos\MShop\Context\Item\Iface $context )
	53	+ public function get(\Aimeos\MShop\Context\Item\Iface $context)
54	54	{
55		- if( $this->locale === null )
	55	+ if ($this->locale === null)
56	56	{
57		- $site = Input::get( 'site', 'default' );
58		- $currency = Input::get( 'currency', '' );
59		- $lang = Input::get( 'locale', '' );
	57	+ $site = Input::get('site', 'default');
	58	+ $currency = Input::get('currency', '');
	59	+ $lang = Input::get('locale', '');
60	60
61		- if( Route::current() )
	61	+ if (Route::current())
62	62	{
63		- $site = Route::input( 'site', $site );
64		- $currency = Route::input( 'currency', $currency );
65		- $lang = Route::input( 'locale', $lang );
	63	+ $site = Route::input('site', $site);
	64	+ $currency = Route::input('currency', $currency);
	65	+ $lang = Route::input('locale', $lang);
66	66	}
67	67
68		- $disableSites = $this->config->get( 'shop.disableSites', true );
	68	+ $disableSites = $this->config->get('shop.disableSites', true);
69	69
70		- $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
71		- $this->locale = $localeManager->bootstrap( $site, $lang, $currency, $disableSites );
	70	+ $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
	71	+ $this->locale = $localeManager->bootstrap($site, $lang, $currency, $disableSites);
72	72	}
73	73
74	74	return $this->locale;
		@@ -82,17 +82,17 @@ discard block
		block discarded – undo
82	82	* @param string $site Unique site code
83	83	* @return \Aimeos\MShop\Locale\Item\Iface Locale item object
84	84	*/
85		- public function getBackend( \Aimeos\MShop\Context\Item\Iface $context, $site )
	85	+ public function getBackend(\Aimeos\MShop\Context\Item\Iface $context, $site)
86	86	{
87		- $localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
	87	+ $localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
88	88
89	89	try
90	90	{
91		- $localeItem = $localeManager->bootstrap( $site, '', '', false );
92		- $localeItem->setLanguageId( null );
93		- $localeItem->setCurrencyId( null );
	91	+ $localeItem = $localeManager->bootstrap($site, '', '', false);
	92	+ $localeItem->setLanguageId(null);
	93	+ $localeItem->setCurrencyId(null);
94	94	}
95		- catch( \Aimeos\MShop\Locale\Exception $e )
	95	+ catch (\Aimeos\MShop\Locale\Exception $e)
96	96	{
97	97	$localeItem = $localeManager->createItem();
98	98	}

		@@ -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,22 +53,22 @@ discard block
		block discarded – undo
53	53	* @param array $languageIds List of two letter ISO language IDs
54	54	* @return \Aimeos\MW\Translation\Iface[] List of translation objects
55	55	*/
56		- public function get( array $languageIds )
	56	+ public function get(array $languageIds)
57	57	{
58	58	$i18nPaths = $this->aimeos->get()->getI18nPaths();
59	59
60		- foreach( $languageIds as $langid )
	60	+ foreach ($languageIds as $langid)
61	61	{
62		- if( !isset( $this->i18n[$langid] ) )
	62	+ if (!isset($this->i18n[$langid]))
63	63	{
64		- $i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $langid );
	64	+ $i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $langid);
65	65
66		- if( function_exists( 'apc_store' ) === true && $this->config->get( 'shop.apc_enabled', false ) == true ) {
67		- $i18n = new \Aimeos\MW\Translation\Decorator\APC( $i18n, $this->config->get( 'shop.apc_prefix', 'laravel:' ) );
	66	+ if (function_exists('apc_store') === true && $this->config->get('shop.apc_enabled', false) == true) {
	67	+ $i18n = new \Aimeos\MW\Translation\Decorator\APC($i18n, $this->config->get('shop.apc_prefix', 'laravel:'));
68	68	}
69	69
70		- if( $this->config->has( 'shop.i18n.' . $langid ) ) {
71		- $i18n = new \Aimeos\MW\Translation\Decorator\Memory( $i18n, $this->config->get( 'shop.i18n.' . $langid ) );
	70	+ if ($this->config->has('shop.i18n.'.$langid)) {
	71	+ $i18n = new \Aimeos\MW\Translation\Decorator\Memory($i18n, $this->config->get('shop.i18n.'.$langid));
72	72	}
73	73
74	74	$this->i18n[$langid] = $i18n;

		@@ -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,23 +71,23 @@ 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		- $pagesConfig = $this->config->get( 'shop.page', array() );
83		- $result = array( 'aibody' => array(), 'aiheader' => array() );
	82	+ $pagesConfig = $this->config->get('shop.page', array());
	83	+ $result = array('aibody' => array(), 'aiheader' => array());
84	84
85		- if( isset( $pagesConfig[$pageName] ) )
	85	+ if (isset($pagesConfig[$pageName]))
86	86	{
87		- foreach( (array) $pagesConfig[$pageName] as $clientName )
	87	+ foreach ((array) $pagesConfig[$pageName] as $clientName)
88	88	{
89		- $client = \Aimeos\Client\Html\Factory::createClient( $context, $tmplPaths, $clientName );
90		- $client->setView( clone $view );
	89	+ $client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName);
	90	+ $client->setView(clone $view);
91	91	$client->process();
92	92
93	93	$result['aibody'][$clientName] = $client->getBody();

		@@ -39,7 +39,7 @@ discard block
		block discarded – undo
39	39	* @param \Aimeos\Shop\Base\Context $context Context provider
40	40	* @param \Aimeos\Shop\Base\Locale $locale Locale provider
41	41	*/
42		- public function __construct( \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale )
	42	+ public function __construct(\Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale)
43	43	{
44	44	$this->context = $context;
45	45	$this->locale = $locale;
		@@ -53,45 +53,45 @@ discard block
		block discarded – undo
53	53	* @param string\|array $groupcodes Unique user/customer group codes that are allowed
54	54	* @return boolean True if user is part of the group, false if not
55	55	*/
56		- public function checkGroup( $userid, $groupcodes )
	56	+ public function checkGroup($userid, $groupcodes)
57	57	{
58		- $site = ( Route::current() ? Route::input( 'site', Input::get( 'site', 'default' ) ) : 'default' );
	58	+ $site = (Route::current() ? Route::input('site', Input::get('site', 'default')) : 'default');
59	59
60		- $context = $this->context->get( false );
61		- $context->setLocale( $this->locale->getBackend( $context, $site ) );
	60	+ $context = $this->context->get(false);
	61	+ $context->setLocale($this->locale->getBackend($context, $site));
62	62
63	63
64		- $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' );
	64	+ $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group');
65	65
66	66	$search = $manager->createSearch();
67		- $search->setConditions( $search->compare( '==', 'customer.group.code', (array) $groupcodes ) );
68		- $groupItems = $manager->searchItems( $search );
	67	+ $search->setConditions($search->compare('==', 'customer.group.code', (array) $groupcodes));
	68	+ $groupItems = $manager->searchItems($search);
69	69
70	70
71		- $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
	71	+ $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
72	72
73	73	$search = $manager->createSearch();
74	74	$expr = array(
75		- $search->compare( '==', 'customer.lists.parentid', $userid ),
76		- $search->compare( '==', 'customer.lists.refid', array_keys( $groupItems ) ),
77		- $search->compare( '==', 'customer.lists.domain', 'customer/group' ),
	75	+ $search->compare('==', 'customer.lists.parentid', $userid),
	76	+ $search->compare('==', 'customer.lists.refid', array_keys($groupItems)),
	77	+ $search->compare('==', 'customer.lists.domain', 'customer/group'),
78	78	);
79		- $search->setConditions( $search->combine( '&&', $expr ) );
80		- $search->setSlice( 0, 1 );
	79	+ $search->setConditions($search->combine('&&', $expr));
	80	+ $search->setSlice(0, 1);
81	81
82		- return (bool) count( $manager->searchItems( $search ) );
	82	+ return (bool) count($manager->searchItems($search));
83	83	}
84	84
85	85
86		- public function getGroups( \Aimeos\MShop\Context\Item\Iface $context )
	86	+ public function getGroups(\Aimeos\MShop\Context\Item\Iface $context)
87	87	{
88	88	$list = array();
89		- $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' );
	89	+ $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group');
90	90
91	91	$search = $manager->createSearch();
92		- $search->setConditions( $search->compare( '==', 'customer.group.id', $context->getGroupIds() ) );
	92	+ $search->setConditions($search->compare('==', 'customer.group.id', $context->getGroupIds()));
93	93
94		- foreach( $manager->searchItems( $search ) as $item ) {
	94	+ foreach ($manager->searchItems($search) as $item) {
95	95	$list[] = $item->getCode();
96	96	}
97	97

		@@ -43,24 +43,24 @@ discard block
		block discarded – undo
43	43	*/
44	44	public function fire()
45	45	{
46		- $aimeos = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get();
	46	+ $aimeos = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get();
47	47	$context = $this->getContext();
48	48
49		- $jobs = explode( ' ', $this->argument( 'jobs' ) );
50		- $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
	49	+ $jobs = explode(' ', $this->argument('jobs'));
	50	+ $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
51	51
52		- foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem )
	52	+ foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem)
53	53	{
54		- $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );
55		- $localeItem->setLanguageId( null );
56		- $localeItem->setCurrencyId( null );
	54	+ $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
	55	+ $localeItem->setLanguageId(null);
	56	+ $localeItem->setCurrencyId(null);
57	57
58		- $context->setLocale( $localeItem );
	58	+ $context->setLocale($localeItem);
59	59
60		- $this->info( sprintf( 'Executing the Aimeos jobs for "%s"', $siteItem->getCode() ) );
	60	+ $this->info(sprintf('Executing the Aimeos jobs for "%s"', $siteItem->getCode()));
61	61
62		- foreach( $jobs as $jobname ) {
63		- \Aimeos\Controller\Jobs\Factory::createController( $context, $aimeos, $jobname )->run();
	62	+ foreach ($jobs as $jobname) {
	63	+ \Aimeos\Controller\Jobs\Factory::createController($context, $aimeos, $jobname)->run();
64	64	}
65	65	}
66	66	}
		@@ -74,8 +74,8 @@ discard block
		block discarded – undo
74	74	protected function getArguments()
75	75	{
76	76	return array(
77		- array( 'jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"' ),
78		- array( 'site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)' ),
	77	+ array('jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"'),
	78	+ array('site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)'),
79	79	);
80	80	}
81	81
		@@ -98,19 +98,19 @@ discard block
		block discarded – undo
98	98	protected function getContext()
99	99	{
100	100	$lv = $this->getLaravel();
101		- $aimeos = $lv->make( '\Aimeos\Shop\Base\Aimeos' )->get();
102		- $context = $lv->make( '\Aimeos\Shop\Base\Context' )->get( false, 'command' );
	101	+ $aimeos = $lv->make('\Aimeos\Shop\Base\Aimeos')->get();
	102	+ $context = $lv->make('\Aimeos\Shop\Base\Context')->get(false, 'command');
103	103
104		- $tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' );
105		- $view = $lv->make( '\Aimeos\Shop\Base\View' )->create( $context, $tmplPaths );
	104	+ $tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates');
	105	+ $view = $lv->make('\Aimeos\Shop\Base\View')->create($context, $tmplPaths);
106	106
107		- $langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context )->getSubManager( 'language' );
108		- $langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) );
109		- $i18n = $lv->make( '\Aimeos\Shop\Base\I18n' )->get( $langids );
	107	+ $langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context)->getSubManager('language');
	108	+ $langids = array_keys($langManager->searchItems($langManager->createSearch(true)));
	109	+ $i18n = $lv->make('\Aimeos\Shop\Base\I18n')->get($langids);
110	110
111		- $context->setEditor( 'aimeos:jobs' );
112		- $context->setView( $view );
113		- $context->setI18n( $i18n );
	111	+ $context->setEditor('aimeos:jobs');
	112	+ $context->setView($view);
	113	+ $context->setI18n($i18n);
114	114
115	115	return $context;
116	116	}

aimeos / aimeos-laravel

Push — master ( 4f506c...6daf04 )

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

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

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

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

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

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

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

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