aimeos / aimeos-laravel

src/Aimeos/Shop/Base/Support.php

Spacing +19 added lines, -19 removed lines

@@ -39,7 +39,7 @@ 
 	 * @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 @@ 
 	 * @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();
 		}
 

src/Aimeos/Shop/Controller/JsonadmController.php

Spacing +44 added lines, -44 removed lines

@@ -35,19 +35,19 @@ 
 	 * @param \Illuminate\Http\Request $request Request object
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
-	public function deleteAction( Request $request )
+	public function deleteAction(Request $request)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [['admin', 'api']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [['admin', 'api']]);
 		}
 
 		$status = 500;
 		$header = $request->headers->all();
 
 		$client = $this->createClient();
-		$result = $client->delete( (string) $request->getContent(), $header, $status );
+		$result = $client->delete((string) $request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -57,19 +57,19 @@ 
 	 * @param \Illuminate\Http\Request $request Request object
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
-	public function getAction( Request $request )
+	public function getAction(Request $request)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [['admin', 'api', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [['admin', 'api', 'editor']]);
 		}
 
 		$status = 500;
 		$header = $request->headers->all();
 
 		$client = $this->createClient();
-		$result = $client->get( (string) $request->getContent(), $header, $status );
+		$result = $client->get((string) $request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -79,19 +79,19 @@ 
 	 * @param \Illuminate\Http\Request $request Request object
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
-	public function patchAction( Request $request )
+	public function patchAction(Request $request)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [['admin', 'api']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [['admin', 'api']]);
 		}
 
 		$status = 500;
 		$header = $request->headers->all();
 
 		$client = $this->createClient();
-		$result = $client->patch( (string) $request->getContent(), $header, $status );
+		$result = $client->patch((string) $request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -101,19 +101,19 @@ 
 	 * @param \Illuminate\Http\Request $request Request object
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
-	public function postAction( Request $request )
+	public function postAction(Request $request)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [['admin', 'api']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [['admin', 'api']]);
 		}
 
 		$status = 500;
 		$header = $request->headers->all();
 
 		$client = $this->createClient();
-		$result = $client->post( (string) $request->getContent(), $header, $status );
+		$result = $client->post((string) $request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -123,19 +123,19 @@ 
 	 * @param \Illuminate\Http\Request $request Request object
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
-	public function putAction( Request $request )
+	public function putAction(Request $request)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [['admin', 'api']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [['admin', 'api']]);
 		}
 
 		$status = 500;
 		$header = $request->headers->all();
 
 		$client = $this->createClient();
-		$result = $client->put( (string) $request->getContent(), $header, $status );
+		$result = $client->put((string) $request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -145,19 +145,19 @@ 
 	 * @param \Illuminate\Http\Request $request Request object
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
-	public function optionsAction( Request $request )
+	public function optionsAction(Request $request)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin', [['admin', 'api', 'editor']] );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin', [['admin', 'api', 'editor']]);
 		}
 
 		$status = 500;
 		$header = $request->headers->all();
 
 		$client = $this->createClient();
-		$result = $client->options( (string) $request->getContent(), $header, $status );
+		$result = $client->options((string) $request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -168,19 +168,19 @@ 
 	 */
 	protected function createClient()
 	{
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
-		$lang = Input::get( 'lang', config( 'app.locale', 'en' ) );
-		$resource = Route::input( 'resource' );
+		$site = Route::input('site', Input::get('site', 'default'));
+		$lang = Input::get('lang', config('app.locale', 'en'));
+		$resource = Route::input('resource');
 
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' );
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
+		$templatePaths = $aimeos->getCustomPaths('admin/jsonadm/templates');
 
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' );
-		$context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang, 'en' ) ) );
-		$context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) );
-		$context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $templatePaths, $lang ) );
+		$context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend');
+		$context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en')));
+		$context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site));
+		$context->setView(app('\Aimeos\Shop\Base\View')->create($context, $templatePaths, $lang));
 
-		return \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, $resource );
+		return \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, $resource);
 	}
 
 
@@ -192,12 +192,12 @@ 
 	 * @param array $header List of HTTP headers
 	 * @return \Illuminate\Http\Response HTTP response object
 	 */
-	protected function createResponse( $content, $status, array $header )
+	protected function createResponse($content, $status, array $header)
 	{
-		$response = Response::make( $content, $status );
+		$response = Response::make($content, $status);
 
-		foreach( $header as $key => $value ) {
-			$response->header( $key, $value );
+		foreach ($header as $key => $value) {
+			$response->header($key, $value);
 		}
 
 		return $response;

src/Aimeos/Shop/Command/CacheCommand.php

Spacing +11 added lines, -11 removed lines

@@ -42,24 +42,24 @@ 
 	 */
 	public function fire()
 	{
-		$context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false, 'command' );
-		$context->setEditor( 'aimeos:cache' );
+		$context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false, 'command');
+		$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 @@ 
 	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)'),
 		);
 	}
 

src/Aimeos/Shop/Command/JobsCommand.php

Spacing +23 added lines, -23 removed lines

@@ -43,24 +43,24 @@ 
 	 */
 	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 @@ 
 	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 @@ 
 	protected function getContext()
 	{
 		$lv = $this->getLaravel();
-		$aimeos = $lv->make( '\Aimeos\Shop\Base\Aimeos' )->get();
-		$context = $lv->make( '\Aimeos\Shop\Base\Context' )->get( false, 'command' );
+		$aimeos = $lv->make('\Aimeos\Shop\Base\Aimeos')->get();
+		$context = $lv->make('\Aimeos\Shop\Base\Context')->get(false, 'command');
 
-		$tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' );
-		$view = $lv->make( '\Aimeos\Shop\Base\View' )->create( $context, $tmplPaths );
+		$tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates');
+		$view = $lv->make('\Aimeos\Shop\Base\View')->create($context, $tmplPaths);
 
-		$langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context )->getSubManager( 'language' );
-		$langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) );
-		$i18n = $lv->make( '\Aimeos\Shop\Base\I18n' )->get( $langids );
+		$langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context)->getSubManager('language');
+		$langids = array_keys($langManager->searchItems($langManager->createSearch(true)));
+		$i18n = $lv->make('\Aimeos\Shop\Base\I18n')->get($langids);
 
-		$context->setEditor( 'aimeos:jobs' );
-		$context->setView( $view );
-		$context->setI18n( $i18n );
+		$context->setEditor('aimeos:jobs');
+		$context->setView($view);
+		$context->setI18n($i18n);
 
 		return $context;
 	}

src/Aimeos/Shop/Command/SetupCommand.php

Spacing +31 added lines, -31 removed lines

@@ -43,39 +43,39 @@ 
 	 */
 	public function fire()
 	{
-		$ctx = $this->getLaravel()->make( '\Aimeos\Shop\Base\Context' )->get( false, 'command' );
-		$ctx->setEditor( 'aimeos:setup' );
+		$ctx = $this->getLaravel()->make('\Aimeos\Shop\Base\Context')->get(false, 'command');
+		$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 );
-		$manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx );
+		$taskPaths = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get()->getSetupPaths($template);
+		$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')));
 		}
 	}
 
@@ -88,8 +88,8 @@ 
 	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'),
 		);
 	}
 
@@ -102,9 +102,9 @@ 
 	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),
 		);
 	}
 
@@ -115,14 +115,14 @@ 
 	 * @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]);
 			}
 		}
 
@@ -137,12 +137,12 @@ 
 	 * @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( str_replace( '\\', '/', $name ), $value );
+			list($name, $value) = explode(':', $option);
+			$conf->set(str_replace('\\', '/', $name), $value);
 		}
 	}
 }