Inspection of "Use context object in view class" - aimeos/aimeos-laravel - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( c525ce...fb4432 )

by Aimeos

created 2016-09-25 19:11 UTC

Status

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

@@ -10,7 +10,7 @@  discard block
 block discarded – undo
 		<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/css/tether.min.css">
 		<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 		<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/css/bootstrap.min.css">
-		<link rel="stylesheet" href="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'type' => 'css' ) ); ?>">
+		<link rel="stylesheet" href="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'type' => 'css')); ?>">
 
     	<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     	<!--[if lt IE 9]>
@@ -29,6 +29,6 @@  discard block
 block discarded – undo
 		<script src="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/js/bootstrap.min.js"></script>
 		<script src="//cdnjs.cloudflare.com/ajax/libs/ckeditor/4.5.4/ckeditor.js"></script>
 		<script src="//cdnjs.cloudflare.com/ajax/libs/ckeditor/4.5.4/adapters/jquery.js"></script>
-		<script src="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'type' => 'js' ) ); ?>"></script>
+		<script src="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'type' => 'js')); ?>"></script>
 	</body>
 </html>

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="//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/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', ['admin', 'editor'] ) ) === false
+		if (config('shop.authorize', true) && (Auth::check() === false
+			|| $request->user()->can('admin', ['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/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/Command/CacheCommand.php 1 patch

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

@@ -42,24 +42,24 @@  discard block
 block discarded – undo
 	 */
 	public function fire()
 	{
-		$context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false, 'backend' );
-		$context->setEditor( 'aimeos:cache' );
+		$context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false, 'backend');
+		$context->setEditor('aimeos:cache');
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
 
-		foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem )
+		foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem)
 		{
-			$localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
 
 			$lcontext = clone $context;
-			$lcontext->setLocale( $localeItem );
+			$lcontext->setLocale($localeItem);
 
-			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext );
-			$lcontext->setCache( $cache );
+			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext);
+			$lcontext->setCache($cache);
 
-			$this->info( sprintf( 'Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode() ) );
+			$this->info(sprintf('Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode()));
 
-			\Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->flush();
+			\Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->flush();
 		}
 	}
 
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
 	protected function getArguments()
 	{
 		return array(
-			array( 'site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)' ),
+			array('site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)'),
 		);
 	}
 

Please login to merge, or discard this patch.

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

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

@@ -42,18 +42,18 @@  discard block
 block discarded – undo
 	 * @param string $classname Name of the setup task class
 	 * @return boolean True if class is found, false if not
 	 */
-	public static function autoload( $classname )
+	public static function autoload($classname)
 	{
-		if( strncmp( $classname, 'Aimeos\\MW\\Setup\\Task\\', 21 ) === 0 )
+		if (strncmp($classname, 'Aimeos\\MW\\Setup\\Task\\', 21) === 0)
 		{
-			$fileName = substr( $classname, 21 ) . '.php';
-			$paths = explode( PATH_SEPARATOR, get_include_path() );
+			$fileName = substr($classname, 21).'.php';
+			$paths = explode(PATH_SEPARATOR, get_include_path());
 
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
-				$file = $path . DIRECTORY_SEPARATOR . $fileName;
+				$file = $path.DIRECTORY_SEPARATOR.$fileName;
 
-				if( file_exists( $file ) === true && ( include_once $file ) !== false ) {
+				if (file_exists($file) === true && (include_once $file) !== false) {
 					return true;
 				}
 			}
@@ -70,49 +70,49 @@  discard block
 block discarded – undo
 	 */
 	public function fire()
 	{
-		$ctx = $this->getLaravel()->make( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' );
-		$ctx->setEditor( 'aimeos:setup' );
+		$ctx = $this->getLaravel()->make('\Aimeos\Shop\Base\Context')->get(false, 'backend');
+		$ctx->setEditor('aimeos:setup');
 
 		$config = $ctx->getConfig();
-		$site = $this->argument( 'site' );
-		$template = $this->argument( 'tplsite' );
+		$site = $this->argument('site');
+		$template = $this->argument('tplsite');
 
-		$config->set( 'setup/site', $site );
-		$dbconfig = $this->getDbConfig( $config );
-		$this->setOptions( $config );
+		$config->set('setup/site', $site);
+		$dbconfig = $this->getDbConfig($config);
+		$this->setOptions($config);
 
-		$taskPaths = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get()->getSetupPaths( $template );
+		$taskPaths = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get()->getSetupPaths($template);
 
 		$includePaths = $taskPaths;
 		$includePaths[] = get_include_path();
 
-		if( set_include_path( implode( PATH_SEPARATOR, $includePaths ) ) === false ) {
-			throw new \Exception( 'Unable to extend include path' );
+		if (set_include_path(implode(PATH_SEPARATOR, $includePaths)) === false) {
+			throw new \Exception('Unable to extend include path');
 		}
 
-		spl_autoload_register( '\Aimeos\Shop\Command\SetupCommand::autoload', true );
+		spl_autoload_register('\Aimeos\Shop\Command\SetupCommand::autoload', true);
 
-		$manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx );
+		$manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx);
 
-		$this->info( sprintf( 'Initializing or updating the Aimeos database tables for site "%1$s"', $site ) );
+		$this->info(sprintf('Initializing or updating the Aimeos database tables for site "%1$s"', $site));
 
-		if( ( $task = $this->option( 'task' ) ) && is_array( $task ) ) {
-			$task = reset( $task );
+		if (($task = $this->option('task')) && is_array($task)) {
+			$task = reset($task);
 		}
 
-		switch( $this->option( 'action' ) )
+		switch ($this->option('action'))
 		{
 			case 'migrate':
-				$manager->migrate( $task );
+				$manager->migrate($task);
 				break;
 			case 'rollback':
-				$manager->rollback( $task );
+				$manager->rollback($task);
 				break;
 			case 'clean':
-				$manager->clean( $task );
+				$manager->clean($task);
 				break;
 			default:
-				throw new \Exception( sprintf( 'Invalid setup action "%1$s"', $this->option( 'action' ) ) );
+				throw new \Exception(sprintf('Invalid setup action "%1$s"', $this->option('action')));
 		}
 	}
 
@@ -125,8 +125,8 @@  discard block
 block discarded – undo
 	protected function getArguments()
 	{
 		return array(
-			array( 'site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default' ),
-			array( 'tplsite', InputArgument::OPTIONAL, 'Site used as template for creating the new one', 'default' ),
+			array('site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default'),
+			array('tplsite', InputArgument::OPTIONAL, 'Site used as template for creating the new one', 'default'),
 		);
 	}
 
@@ -139,9 +139,9 @@  discard block
 block discarded – undo
 	protected function getOptions()
 	{
 		return array(
-			array( 'option', null, InputOption::VALUE_REQUIRED, 'Setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array() ),
-			array( 'action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate' ),
-			array( 'task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null ),
+			array('option', null, InputOption::VALUE_REQUIRED, 'Setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array()),
+			array('action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate'),
+			array('task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null),
 		);
 	}
 
@@ -152,14 +152,14 @@  discard block
 block discarded – undo
 	 * @param \Aimeos\MW\Config\Iface $conf Config object
 	 * @return array Multi-dimensional associative list of database configuration parameters
 	 */
-	protected function getDbConfig( \Aimeos\MW\Config\Iface $conf )
+	protected function getDbConfig(\Aimeos\MW\Config\Iface $conf)
 	{
-		$dbconfig = $conf->get( 'resource', array() );
+		$dbconfig = $conf->get('resource', array());
 
-		foreach( $dbconfig as $rname => $dbconf )
+		foreach ($dbconfig as $rname => $dbconf)
 		{
-			if( strncmp( $rname, 'db', 2 ) !== 0 ) {
-				unset( $dbconfig[$rname] );
+			if (strncmp($rname, 'db', 2) !== 0) {
+				unset($dbconfig[$rname]);
 			}
 		}
 
@@ -174,12 +174,12 @@  discard block
 block discarded – undo
 	 * @param array Associative list of database configurations
 	 * @throws \RuntimeException If the format of the options is invalid
 	 */
-	protected function setOptions( \Aimeos\MW\Config\Iface $conf )
+	protected function setOptions(\Aimeos\MW\Config\Iface $conf)
 	{
-		foreach( (array) $this->option( 'option' ) as $option )
+		foreach ((array) $this->option('option') as $option)
 		{
-			list( $name, $value ) = explode( ':', $option );
-			$conf->set( $name, $value );
+			list($name, $value) = explode(':', $option);
+			$conf->set($name, $value);
 		}
 	}
 }

Please login to merge, or discard this patch.

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

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

@@ -43,21 +43,21 @@  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(), 'en', '', false );
-			$context->setLocale( $localeItem );
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), 'en', '', false);
+			$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();
 			}
 		}
 	}
@@ -71,8 +71,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)'),
 		);
 	}
 
@@ -95,19 +95,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, 'backend' );
+		$aimeos = $lv->make('\Aimeos\Shop\Base\Aimeos')->get();
+		$context = $lv->make('\Aimeos\Shop\Base\Context')->get(false, 'backend');
 
-		$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.

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

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

@@ -35,7 +35,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;
@@ -48,19 +48,19 @@  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')
 	{
 		$configPaths = $this->aimeos->get()->getConfigPaths();
-		$config = new \Aimeos\MW\Config\PHPArray( array(), $configPaths );
+		$config = new \Aimeos\MW\Config\PHPArray(array(), $configPaths);
 
-		if( function_exists( 'apc_store' ) === true && $this->config->get( 'shop.apc_enabled', false ) == true ) {
-			$config = new \Aimeos\MW\Config\Decorator\APC( $config, $this->config->get( 'shop.apc_prefix', 'laravel:' ) );
+		if (function_exists('apc_store') === true && $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);
 		}
 
 		return $config;

Please login to merge, or discard this patch.

		@@ -42,18 +42,18 @@ discard block
		block discarded – undo
42	42	* @param string $classname Name of the setup task class
43	43	* @return boolean True if class is found, false if not
44	44	*/
45		- public static function autoload( $classname )
	45	+ public static function autoload($classname)
46	46	{
47		- if( strncmp( $classname, 'Aimeos\\MW\\Setup\\Task\\', 21 ) === 0 )
	47	+ if (strncmp($classname, 'Aimeos\\MW\\Setup\\Task\\', 21) === 0)
48	48	{
49		- $fileName = substr( $classname, 21 ) . '.php';
50		- $paths = explode( PATH_SEPARATOR, get_include_path() );
	49	+ $fileName = substr($classname, 21).'.php';
	50	+ $paths = explode(PATH_SEPARATOR, get_include_path());
51	51
52		- foreach( $paths as $path )
	52	+ foreach ($paths as $path)
53	53	{
54		- $file = $path . DIRECTORY_SEPARATOR . $fileName;
	54	+ $file = $path.DIRECTORY_SEPARATOR.$fileName;
55	55
56		- if( file_exists( $file ) === true && ( include_once $file ) !== false ) {
	56	+ if (file_exists($file) === true && (include_once $file) !== false) {
57	57	return true;
58	58	}
59	59	}
		@@ -70,49 +70,49 @@ discard block
		block discarded – undo
70	70	*/
71	71	public function fire()
72	72	{
73		- $ctx = $this->getLaravel()->make( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' );
74		- $ctx->setEditor( 'aimeos:setup' );
	73	+ $ctx = $this->getLaravel()->make('\Aimeos\Shop\Base\Context')->get(false, 'backend');
	74	+ $ctx->setEditor('aimeos:setup');
75	75
76	76	$config = $ctx->getConfig();
77		- $site = $this->argument( 'site' );
78		- $template = $this->argument( 'tplsite' );
	77	+ $site = $this->argument('site');
	78	+ $template = $this->argument('tplsite');
79	79
80		- $config->set( 'setup/site', $site );
81		- $dbconfig = $this->getDbConfig( $config );
82		- $this->setOptions( $config );
	80	+ $config->set('setup/site', $site);
	81	+ $dbconfig = $this->getDbConfig($config);
	82	+ $this->setOptions($config);
83	83
84		- $taskPaths = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get()->getSetupPaths( $template );
	84	+ $taskPaths = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get()->getSetupPaths($template);
85	85
86	86	$includePaths = $taskPaths;
87	87	$includePaths[] = get_include_path();
88	88
89		- if( set_include_path( implode( PATH_SEPARATOR, $includePaths ) ) === false ) {
90		- throw new \Exception( 'Unable to extend include path' );
	89	+ if (set_include_path(implode(PATH_SEPARATOR, $includePaths)) === false) {
	90	+ throw new \Exception('Unable to extend include path');
91	91	}
92	92
93		- spl_autoload_register( '\Aimeos\Shop\Command\SetupCommand::autoload', true );
	93	+ spl_autoload_register('\Aimeos\Shop\Command\SetupCommand::autoload', true);
94	94
95		- $manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx );
	95	+ $manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx);
96	96
97		- $this->info( sprintf( 'Initializing or updating the Aimeos database tables for site "%1$s"', $site ) );
	97	+ $this->info(sprintf('Initializing or updating the Aimeos database tables for site "%1$s"', $site));
98	98
99		- if( ( $task = $this->option( 'task' ) ) && is_array( $task ) ) {
100		- $task = reset( $task );
	99	+ if (($task = $this->option('task')) && is_array($task)) {
	100	+ $task = reset($task);
101	101	}
102	102
103		- switch( $this->option( 'action' ) )
	103	+ switch ($this->option('action'))
104	104	{
105	105	case 'migrate':
106		- $manager->migrate( $task );
	106	+ $manager->migrate($task);
107	107	break;
108	108	case 'rollback':
109		- $manager->rollback( $task );
	109	+ $manager->rollback($task);
110	110	break;
111	111	case 'clean':
112		- $manager->clean( $task );
	112	+ $manager->clean($task);
113	113	break;
114	114	default:
115		- throw new \Exception( sprintf( 'Invalid setup action "%1$s"', $this->option( 'action' ) ) );
	115	+ throw new \Exception(sprintf('Invalid setup action "%1$s"', $this->option('action')));
116	116	}
117	117	}
118	118
		@@ -125,8 +125,8 @@ discard block
		block discarded – undo
125	125	protected function getArguments()
126	126	{
127	127	return array(
128		- array( 'site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default' ),
129		- array( 'tplsite', InputArgument::OPTIONAL, 'Site used as template for creating the new one', 'default' ),
	128	+ array('site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default'),
	129	+ array('tplsite', InputArgument::OPTIONAL, 'Site used as template for creating the new one', 'default'),
130	130	);
131	131	}
132	132
		@@ -139,9 +139,9 @@ discard block
		block discarded – undo
139	139	protected function getOptions()
140	140	{
141	141	return array(
142		- array( 'option', null, InputOption::VALUE_REQUIRED, 'Setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array() ),
143		- array( 'action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate' ),
144		- array( 'task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null ),
	142	+ array('option', null, InputOption::VALUE_REQUIRED, 'Setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array()),
	143	+ array('action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate'),
	144	+ array('task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null),
145	145	);
146	146	}
147	147
		@@ -152,14 +152,14 @@ discard block
		block discarded – undo
152	152	* @param \Aimeos\MW\Config\Iface $conf Config object
153	153	* @return array Multi-dimensional associative list of database configuration parameters
154	154	*/
155		- protected function getDbConfig( \Aimeos\MW\Config\Iface $conf )
	155	+ protected function getDbConfig(\Aimeos\MW\Config\Iface $conf)
156	156	{
157		- $dbconfig = $conf->get( 'resource', array() );
	157	+ $dbconfig = $conf->get('resource', array());
158	158
159		- foreach( $dbconfig as $rname => $dbconf )
	159	+ foreach ($dbconfig as $rname => $dbconf)
160	160	{
161		- if( strncmp( $rname, 'db', 2 ) !== 0 ) {
162		- unset( $dbconfig[$rname] );
	161	+ if (strncmp($rname, 'db', 2) !== 0) {
	162	+ unset($dbconfig[$rname]);
163	163	}
164	164	}
165	165
		@@ -174,12 +174,12 @@ discard block
		block discarded – undo
174	174	* @param array Associative list of database configurations
175	175	* @throws \RuntimeException If the format of the options is invalid
176	176	*/
177		- protected function setOptions( \Aimeos\MW\Config\Iface $conf )
	177	+ protected function setOptions(\Aimeos\MW\Config\Iface $conf)
178	178	{
179		- foreach( (array) $this->option( 'option' ) as $option )
	179	+ foreach ((array) $this->option('option') as $option)
180	180	{
181		- list( $name, $value ) = explode( ':', $option );
182		- $conf->set( $name, $value );
	181	+ list($name, $value) = explode(':', $option);
	182	+ $conf->set($name, $value);
183	183	}
184	184	}
185	185	}

		@@ -10,7 +10,7 @@ discard block
		block discarded – undo
10	10	<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/css/tether.min.css">
11	11	<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
12	12	<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/css/bootstrap.min.css">
13		- <link rel="stylesheet" href="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'type' => 'css' ) ); ?>">
	13	+ <link rel="stylesheet" href="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'type' => 'css')); ?>">
14	14
15	15	<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
16	16	<!--[if lt IE 9]>
		@@ -29,6 +29,6 @@ discard block
		block discarded – undo
29	29	<script src="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/js/bootstrap.min.js"></script>
30	30	<script src="//cdnjs.cloudflare.com/ajax/libs/ckeditor/4.5.4/ckeditor.js"></script>
31	31	<script src="//cdnjs.cloudflare.com/ajax/libs/ckeditor/4.5.4/adapters/jquery.js"></script>
32		- <script src="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'type' => 'js' ) ); ?>"></script>
	32	+ <script src="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'type' => 'js')); ?>"></script>
33	33	</body>
34	34	</html>

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

		@@ -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', ['admin', 'editor'] ) ) === false
	41	+ if (config('shop.authorize', true) && (Auth::check() === false
	42	+ \|\| $request->user()->can('admin', ['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	}

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

		@@ -42,24 +42,24 @@ discard block
		block discarded – undo
42	42	*/
43	43	public function fire()
44	44	{
45		- $context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false, 'backend' );
46		- $context->setEditor( 'aimeos:cache' );
	45	+ $context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false, 'backend');
	46	+ $context->setEditor('aimeos:cache');
47	47
48		- $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
	48	+ $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
49	49
50		- foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem )
	50	+ foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem)
51	51	{
52		- $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );
	52	+ $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
53	53
54	54	$lcontext = clone $context;
55		- $lcontext->setLocale( $localeItem );
	55	+ $lcontext->setLocale($localeItem);
56	56
57		- $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext );
58		- $lcontext->setCache( $cache );
	57	+ $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext);
	58	+ $lcontext->setCache($cache);
59	59
60		- $this->info( sprintf( 'Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode() ) );
	60	+ $this->info(sprintf('Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode()));
61	61
62		- \Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->flush();
	62	+ \Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->flush();
63	63	}
64	64	}
65	65
		@@ -72,7 +72,7 @@ discard block
		block discarded – undo
72	72	protected function getArguments()
73	73	{
74	74	return array(
75		- array( 'site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)' ),
	75	+ array('site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)'),
76	76	);
77	77	}
78	78

		@@ -43,21 +43,21 @@ 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(), 'en', '', false );
55		- $context->setLocale( $localeItem );
	54	+ $localeItem = $localeManager->bootstrap($siteItem->getCode(), 'en', '', false);
	55	+ $context->setLocale($localeItem);
56	56
57		- $this->info( sprintf( 'Executing the Aimeos jobs for "%s"', $siteItem->getCode() ) );
	57	+ $this->info(sprintf('Executing the Aimeos jobs for "%s"', $siteItem->getCode()));
58	58
59		- foreach( $jobs as $jobname ) {
60		- \Aimeos\Controller\Jobs\Factory::createController( $context, $aimeos, $jobname )->run();
	59	+ foreach ($jobs as $jobname) {
	60	+ \Aimeos\Controller\Jobs\Factory::createController($context, $aimeos, $jobname)->run();
61	61	}
62	62	}
63	63	}
		@@ -71,8 +71,8 @@ discard block
		block discarded – undo
71	71	protected function getArguments()
72	72	{
73	73	return array(
74		- array( 'jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"' ),
75		- array( 'site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)' ),
	74	+ array('jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"'),
	75	+ array('site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)'),
76	76	);
77	77	}
78	78
		@@ -95,19 +95,19 @@ discard block
		block discarded – undo
95	95	protected function getContext()
96	96	{
97	97	$lv = $this->getLaravel();
98		- $aimeos = $lv->make( '\Aimeos\Shop\Base\Aimeos' )->get();
99		- $context = $lv->make( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' );
	98	+ $aimeos = $lv->make('\Aimeos\Shop\Base\Aimeos')->get();
	99	+ $context = $lv->make('\Aimeos\Shop\Base\Context')->get(false, 'backend');
100	100
101		- $tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' );
102		- $view = $lv->make( '\Aimeos\Shop\Base\View' )->create( $context, $tmplPaths );
	101	+ $tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates');
	102	+ $view = $lv->make('\Aimeos\Shop\Base\View')->create($context, $tmplPaths);
103	103
104		- $langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context )->getSubManager( 'language' );
105		- $langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) );
106		- $i18n = $lv->make( '\Aimeos\Shop\Base\I18n' )->get( $langids );
	104	+ $langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context)->getSubManager('language');
	105	+ $langids = array_keys($langManager->searchItems($langManager->createSearch(true)));
	106	+ $i18n = $lv->make('\Aimeos\Shop\Base\I18n')->get($langids);
107	107
108		- $context->setEditor( 'aimeos:jobs' );
109		- $context->setView( $view );
110		- $context->setI18n( $i18n );
	108	+ $context->setEditor('aimeos:jobs');
	109	+ $context->setView($view);
	110	+ $context->setI18n($i18n);
111	111
112	112	return $context;
113	113	}

		@@ -35,7 +35,7 @@ discard block
		block discarded – undo
35	35	* @param \Illuminate\Contracts\Config\Repository $config Configuration object
36	36	* @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object
37	37	*/
38		- public function __construct( \Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos )
	38	+ public function __construct(\Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos)
39	39	{
40	40	$this->aimeos = $aimeos;
41	41	$this->config = $config;
		@@ -48,19 +48,19 @@ discard block
		block discarded – undo
48	48	* @param integer $type Configuration type ("frontend" or "backend")
49	49	* @return \Aimeos\MW\Config\Iface Configuration object
50	50	*/
51		- public function get( $type = 'frontend' )
	51	+ public function get($type = 'frontend')
52	52	{
53	53	$configPaths = $this->aimeos->get()->getConfigPaths();
54		- $config = new \Aimeos\MW\Config\PHPArray( array(), $configPaths );
	54	+ $config = new \Aimeos\MW\Config\PHPArray(array(), $configPaths);
55	55
56		- if( function_exists( 'apc_store' ) === true && $this->config->get( 'shop.apc_enabled', false ) == true ) {
57		- $config = new \Aimeos\MW\Config\Decorator\APC( $config, $this->config->get( 'shop.apc_prefix', 'laravel:' ) );
	56	+ if (function_exists('apc_store') === true && $this->config->get('shop.apc_enabled', false) == true) {
	57	+ $config = new \Aimeos\MW\Config\Decorator\APC($config, $this->config->get('shop.apc_prefix', 'laravel:'));
58	58	}
59	59
60		- $config = new \Aimeos\MW\Config\Decorator\Memory( $config, $this->config->get( 'shop' ) );
	60	+ $config = new \Aimeos\MW\Config\Decorator\Memory($config, $this->config->get('shop'));
61	61
62		- if( ( $conf = $this->config->get( 'shop.' . $type, array() ) ) !== array() ) {
63		- $config = new \Aimeos\MW\Config\Decorator\Memory( $config, $conf );
	62	+ if (($conf = $this->config->get('shop.'.$type, array())) !== array()) {
	63	+ $config = new \Aimeos\MW\Config\Decorator\Memory($config, $conf);
64	64	}
65	65
66	66	return $config;

aimeos / aimeos-laravel

Push — master ( c525ce...fb4432 )

Status

Category

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

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

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

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

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