aimeos / aimeos-laravel

src/Aimeos/Shop/Controller/ExtadmController.php

Spacing +71 added lines, -71 removed lines

@@ -34,63 +34,63 @@ 
 	 * @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 ) ) {
-			$this->authorize( 'admin' );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin');
 		}
 
-		$site = Route::input( 'site', 'default' );
-		$lang = Input::get( 'lang', config( 'app.locale', 'en' ) );
+		$site = Route::input('site', 'default');
+		$lang = Input::get('lang', config('app.locale', 'en'));
 
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' );
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos');
 
 		$bootstrap = $aimeos->get();
-		$cntlPaths = $bootstrap->getCustomPaths( 'controller/extjs' );
+		$cntlPaths = $bootstrap->getCustomPaths('controller/extjs');
 
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false );
-		$context = $this->setLocale( $context, $site, $lang );
+		$context = app('\Aimeos\Shop\Base\Context')->get(false);
+		$context = $this->setLocale($context, $site, $lang);
 
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
 		$cssFiles = array();
 
-		foreach( $bootstrap->getCustomPaths( 'admin/extjs' ) as $base => $paths )
+		foreach ($bootstrap->getCustomPaths('admin/extjs') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
 				$jsbAbsPath = $base . '/' . $path;
 
-				if( !is_file( $jsbAbsPath ) ) {
-					throw new \Exception( sprintf( 'JSB2 file "%1$s" not found', $jsbAbsPath ) );
+				if (!is_file($jsbAbsPath)) {
+					throw new \Exception(sprintf('JSB2 file "%1$s" not found', $jsbAbsPath));
 				}
 
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $path ) );
-				$cssFiles = array_merge( $cssFiles, $jsb2->getUrls( 'css' ) );
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($path));
+				$cssFiles = array_merge($cssFiles, $jsb2->getUrls('css'));
 			}
 		}
 
-		$jqadmUrl = route( 'aimeos_shop_jqadm_search', array( 'site' => $site, 'resource' => 'product' ) );
-		$jsonUrl = route( 'aimeos_shop_extadm_json', array( 'site' => $site, '_token' => csrf_token() ) );
-		$adminUrl = route( 'aimeos_shop_extadm', array( 'site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>' ) );
+		$jqadmUrl = route('aimeos_shop_jqadm_search', array('site' => $site, 'resource' => 'product'));
+		$jsonUrl = route('aimeos_shop_extadm_json', array('site' => $site, '_token' => csrf_token()));
+		$adminUrl = route('aimeos_shop_extadm', array('site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>'));
 
 		$vars = array(
 			'lang' => $lang,
 			'cssFiles' => $cssFiles,
-			'languages' => $this->getJsonLanguages( $context),
-			'config' => $this->getJsonClientConfig( $context ),
-			'site' => $this->getJsonSiteItem( $context, $site ),
-			'i18nContent' => $this->getJsonClientI18n( $bootstrap->getI18nPaths(), $lang ),
+			'languages' => $this->getJsonLanguages($context),
+			'config' => $this->getJsonClientConfig($context),
+			'site' => $this->getJsonSiteItem($context, $site),
+			'i18nContent' => $this->getJsonClientI18n($bootstrap->getI18nPaths(), $lang),
 			'searchSchemas' => $controller->getJsonSearchSchemas(),
 			'itemSchemas' => $controller->getJsonItemSchemas(),
-			'smd' => $controller->getJsonSmd( $jsonUrl ),
-			'urlTemplate' => str_replace( ['<', '>'], ['{', '}'], urldecode( $adminUrl ) ),
-			'uploaddir' => config( 'shop::uploaddir' ),
-			'activeTab' => Input::get( 'tab', 0 ),
+			'smd' => $controller->getJsonSmd($jsonUrl),
+			'urlTemplate' => str_replace(['<', '>'], ['{', '}'], urldecode($adminUrl)),
+			'uploaddir' => config('shop::uploaddir'),
+			'activeTab' => Input::get('tab', 0),
 			'version' => $aimeos->getVersion(),
 			'jqadmurl' => $jqadmUrl,
 		);
 
-		return View::make( 'shop::extadm.index', $vars );
+		return View::make('shop::extadm.index', $vars);
 	}
 
 
@@ -101,20 +101,20 @@ 
 	 */
 	public function doAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin' );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin');
 		}
 
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
-		$cntlPaths = $aimeos->getCustomPaths( 'controller/extjs' );
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
+		$cntlPaths = $aimeos->getCustomPaths('controller/extjs');
 
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false );
-		$context = $this->setLocale( $context );
+		$context = app('\Aimeos\Shop\Base\Context')->get(false);
+		$context = $this->setLocale($context);
 
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
 
-		$response = $controller->process( Input::instance()->request->all(), 'php://input' );
-		return View::make( 'shop::extadm.do', array( 'output' => $response ) );
+		$response = $controller->process(Input::instance()->request->all(), 'php://input');
+		return View::make('shop::extadm.do', array('output' => $response));
 	}
 
 
@@ -125,32 +125,32 @@ 
 	 */
 	public function fileAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin' );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin');
 		}
 
 		$contents = '';
 		$jsFiles = array();
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
 
-		foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths )
+		foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
 				$jsbAbsPath = $base . '/' . $path;
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
-				$jsFiles = array_merge( $jsFiles, $jsb2->getFiles( 'js' ) );
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
+				$jsFiles = array_merge($jsFiles, $jsb2->getFiles('js'));
 			}
 		}
 
-		foreach( $jsFiles as $file )
+		foreach ($jsFiles as $file)
 		{
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
+			if (($content = file_get_contents($file)) !== false) {
 				$contents .= $content;
 			}
 		}
 
-		return response( $contents )->header( 'Content-Type', 'application/javascript' );
+		return response($contents)->header('Content-Type', 'application/javascript');
 	}
 
 
@@ -160,15 +160,15 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return array List of language IDs with labels
 	 */
-	protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function getJsonLanguages(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$result = array();
 
-		foreach( app( '\Aimeos\Shop\Base\Aimeos' )->get()->getI18nList( 'admin' ) as $id ) {
-			$result[] = array( 'id' => $id, 'label' => $id );
+		foreach (app('\Aimeos\Shop\Base\Aimeos')->get()->getI18nList('admin') as $id) {
+			$result[] = array('id' => $id, 'label' => $id);
 		}
 
-		return json_encode( $result );
+		return json_encode($result);
 	}
 
 
@@ -178,10 +178,10 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item object
 	 * @return string JSON encoded configuration object
 	 */
-	protected function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function getJsonClientConfig(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$config = $context->getConfig()->get( 'admin/extjs', array() );
-		return json_encode( array( 'admin' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT );
+		$config = $context->getConfig()->get('admin/extjs', array());
+		return json_encode(array('admin' => array('extjs' => $config)), JSON_FORCE_OBJECT);
 	}
 
 
@@ -192,16 +192,16 @@ 
 	 * @param string $lang ISO language code like "en" or "en_GB"
 	 * @return string JSON encoded translation object
 	 */
-	protected function getJsonClientI18n( array $i18nPaths, $lang )
+	protected function getJsonClientI18n(array $i18nPaths, $lang)
 	{
-		$i18n = new \Aimeos\MW\Translation\Zend2( $i18nPaths, 'gettext', $lang, array( 'disableNotices' => true ) );
+		$i18n = new \Aimeos\MW\Translation\Zend2($i18nPaths, 'gettext', $lang, array('disableNotices' => true));
 
 		$content = array(
-			'admin' => $i18n->getAll( 'admin' ),
-			'admin/ext' => $i18n->getAll( 'admin/ext' ),
+			'admin' => $i18n->getAll('admin'),
+			'admin/ext' => $i18n->getAll('admin/ext'),
 		);
 
-		return json_encode( $content, JSON_FORCE_OBJECT );
+		return json_encode($content, JSON_FORCE_OBJECT);
 	}
 
 
@@ -213,19 +213,19 @@ 
 	 * @return string JSON encoded site item object
 	 * @throws Exception If no site item was found for the code
 	 */
-	protected function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site )
+	protected function getJsonSiteItem(\Aimeos\MShop\Context\Item\Iface $context, $site)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');
 
 		$criteria = $manager->createSearch();
-		$criteria->setConditions( $criteria->compare( '==', 'locale.site.code', $site ) );
-		$items = $manager->searchItems( $criteria );
+		$criteria->setConditions($criteria->compare('==', 'locale.site.code', $site));
+		$items = $manager->searchItems($criteria);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( sprintf( 'No site found for code "%1$s"', $site ) );
+		if (($item = reset($items)) === false) {
+			throw new \Exception(sprintf('No site found for code "%1$s"', $site));
 		}
 
-		return json_encode( $item->toArray() );
+		return json_encode($item->toArray());
 	}
 
 
@@ -237,17 +237,17 @@ 
 	 * @param string $locale ISO language code, e.g. "en" or "en_GB"
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null )
+	protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null)
 	{
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
 
 		try {
-			$localeItem = $localeManager->bootstrap( $sitecode, $locale, '', false );
-		} catch( \Aimeos\MShop\Locale\Exception $e ) {
+			$localeItem = $localeManager->bootstrap($sitecode, $locale, '', false);
+		} catch (\Aimeos\MShop\Locale\Exception $e) {
 			$localeItem = $localeManager->createItem();
 		}
 
-		$context->setLocale( $localeItem );
+		$context->setLocale($localeItem);
 
 		return $context;
 	}

src/Aimeos/Shop/Controller/JqadmController.php

Spacing +51 added lines, -51 removed lines

@@ -34,14 +34,14 @@ 
 	 * @param integer $id Unique resource ID
 	 * @return string Generated output
 	 */
-	public function copyAction( $site = 'default', $resource, $id )
+	public function copyAction($site = 'default', $resource, $id)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin' );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin');
 		}
 
-		$cntl = $this->createClient( $site, $resource );
-		return $this->getHtml( $site, $cntl->copy( $id ) );
+		$cntl = $this->createClient($site, $resource);
+		return $this->getHtml($site, $cntl->copy($id));
 	}
 
 
@@ -52,14 +52,14 @@ 
 	 * @param string $sitecode Unique site code
 	 * @return string Generated output
 	 */
-	public function createAction( $site = 'default', $resource )
+	public function createAction($site = 'default', $resource)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin' );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin');
 		}
 
-		$cntl = $this->createClient( $site, $resource );
-		return $this->getHtml( $site, $cntl->create() );
+		$cntl = $this->createClient($site, $resource);
+		return $this->getHtml($site, $cntl->create());
 	}
 
 
@@ -71,14 +71,14 @@ 
 	 * @param integer $id Unique resource ID
 	 * @return string Generated output
 	 */
-	public function deleteAction( $site = 'default', $resource, $id )
+	public function deleteAction($site = 'default', $resource, $id)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin' );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin');
 		}
 
-		$cntl = $this->createClient( $site, $resource );
-		return $this->getHtml( $site, $cntl->delete( $id ) . $cntl->search() );
+		$cntl = $this->createClient($site, $resource);
+		return $this->getHtml($site, $cntl->delete($id) . $cntl->search());
 	}
 
 
@@ -90,14 +90,14 @@ 
 	 * @param integer $id Unique resource ID
 	 * @return string Generated output
 	 */
-	public function getAction( $site = 'default', $resource, $id )
+	public function getAction($site = 'default', $resource, $id)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin' );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin');
 		}
 
-		$cntl = $this->createClient( $site, $resource );
-		return $this->getHtml( $site, $cntl->get( $id ) );
+		$cntl = $this->createClient($site, $resource);
+		return $this->getHtml($site, $cntl->get($id));
 	}
 
 
@@ -108,14 +108,14 @@ 
 	 * @param string $sitecode Unique site code
 	 * @return string Generated output
 	 */
-	public function saveAction( $site = 'default', $resource )
+	public function saveAction($site = 'default', $resource)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin' );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin');
 		}
 
-		$cntl = $this->createClient( $site, $resource );
-		return $this->getHtml( $site, ( $cntl->save() ? : $cntl->search() ) );
+		$cntl = $this->createClient($site, $resource);
+		return $this->getHtml($site, ($cntl->save() ?: $cntl->search()));
 	}
 
 
@@ -126,14 +126,14 @@ 
 	 * @param string $sitecode Unique site code
 	 * @return string Generated output
 	 */
-	public function searchAction( $site = 'default', $resource )
+	public function searchAction($site = 'default', $resource)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin' );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin');
 		}
 
-		$cntl = $this->createClient( $site, $resource );
-		return $this->getHtml( $site, $cntl->search() );
+		$cntl = $this->createClient($site, $resource);
+		return $this->getHtml($site, $cntl->search());
 	}
 
 
@@ -143,20 +143,20 @@ 
 	 * @param string $sitecode Unique site code
 	 * @return \Aimeos\MShop\Context\Item\Iface Context item
 	 */
-	protected function createClient( $sitecode, $resource )
+	protected function createClient($sitecode, $resource)
 	{
-		$lang = Input::get( 'lang', config( 'app.locale', 'en' ) );
+		$lang = Input::get('lang', config('app.locale', 'en'));
 
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' );
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
+		$templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates');
 
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false );
-		$context = $this->setLocale( $context, $sitecode, $lang );
+		$context = app('\Aimeos\Shop\Base\Context')->get(false);
+		$context = $this->setLocale($context, $sitecode, $lang);
 
-		$view = app( '\Aimeos\Shop\Base\View' )->create( $context->getConfig(), $templatePaths, $lang );
-		$context->setView( $view );
+		$view = app('\Aimeos\Shop\Base\View')->create($context->getConfig(), $templatePaths, $lang);
+		$context->setView($view);
 
-		return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource );
+		return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource);
 	}
 
 
@@ -167,12 +167,12 @@ 
 	 * @param string $content Content from admin client
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
 	 */
-	protected function getHtml( $site, $content )
+	protected function getHtml($site, $content)
 	{
-		$version = app( '\Aimeos\Shop\Base\Aimeos' )->getVersion();
-		$content = str_replace( ['{type}', '{version}'], ['Laravel', $version], $content );
+		$version = app('\Aimeos\Shop\Base\Aimeos')->getVersion();
+		$content = str_replace(['{type}', '{version}'], ['Laravel', $version], $content);
 
-		return View::make( 'shop::jqadm.index', array( 'content' => $content ) );
+		return View::make('shop::jqadm.index', array('content' => $content));
 	}
 
 
@@ -184,23 +184,23 @@ 
 	 * @param string $lang ISO language code, e.g. "en" or "en_GB"
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $lang = null )
+	protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $lang = null)
 	{
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
 
 		try
 		{
-			$localeItem = $localeManager->bootstrap( $sitecode, '', '', false );
-			$localeItem->setLanguageId( null );
-			$localeItem->setCurrencyId( null );
+			$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();
 		}
 
-		$context->setLocale( $localeItem );
-		$context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang ) ) );
+		$context->setLocale($localeItem);
+		$context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang)));
 
 		return $context;
 	}

src/Aimeos/Shop/Base/Aimeos.php

Spacing +8 added lines, -8 removed lines

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