aimeos / aimeos-laravel

src/Aimeos/Shop/Controller/AdminController.php

Doc Comments +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
 	 * Creates a list of all available translations.
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
-	 * @return array List of language IDs with labels
+	 * @return string List of language IDs with labels
 	 */
 	protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context )
 	{

Spacing +85 added lines, -85 removed lines

@@ -32,54 +32,54 @@ 
 	 */
 	public function indexAction()
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin' );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin');
 		}
 
-		$site = \Input::get( 'site', 'default' );
-		$lang = \Input::get( 'lang', config( 'app.locale', 'en' ) );
+		$site = \Input::get('site', 'default');
+		$lang = \Input::get('lang', config('app.locale', 'en'));
 
-		$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, $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( $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;
 
-				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'));
 			}
 		}
 
-		$params = array( 'site' => '{site}', 'lang' => '{lang}', 'tab' => '{tab}' );
-		$adminUrl = route( 'aimeos_shop_admin', $params );
-		$jsonUrl = route( 'aimeos_shop_admin_json', array( '_token' => csrf_token() ) );
+		$params = array('site' => '{site}', 'lang' => '{lang}', 'tab' => '{tab}');
+		$adminUrl = route('aimeos_shop_admin', $params);
+		$jsonUrl = route('aimeos_shop_admin_json', array('_token' => csrf_token()));
 
 		$vars = array(
 			'lang' => $lang,
 			'cssFiles' => $cssFiles,
-			'languages' => $this->getJsonLanguages( $context),
-			'config' => $this->getJsonClientConfig( $context ),
-			'site' => $this->getJsonSiteItem( $context, \Input::get( 'site', 'default' ) ),
-			'i18nContent' => $this->getJsonClientI18n( $aimeos->getI18nPaths(), $lang ),
+			'languages' => $this->getJsonLanguages($context),
+			'config' => $this->getJsonClientConfig($context),
+			'site' => $this->getJsonSiteItem($context, \Input::get('site', 'default')),
+			'i18nContent' => $this->getJsonClientI18n($aimeos->getI18nPaths(), $lang),
 			'searchSchemas' => $controller->getJsonSearchSchemas(),
 			'itemSchemas' => $controller->getJsonItemSchemas(),
-			'smd' => $controller->getJsonSmd( $jsonUrl ),
-			'urlTemplate' => urldecode( $adminUrl ),
-			'uploaddir' => \Config::get( 'shop::uploaddir' ),
-			'activeTab' => \Input::get( 'tab', 0 ),
+			'smd' => $controller->getJsonSmd($jsonUrl),
+			'urlTemplate' => urldecode($adminUrl),
+			'uploaddir' => \Config::get('shop::uploaddir'),
+			'activeTab' => \Input::get('tab', 0),
 			'version' => $this->getVersion(),
 		);
 
@@ -94,20 +94,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::admin.do', array( 'output' => $response ));
+		$response = $controller->process(\Input::instance()->request->all(), 'php://input');
+		return \View::make('shop::admin.do', array('output' => $response));
 	}
 
 
@@ -118,32 +118,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->getUrls( 'js', '' ) );
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
+				$jsFiles = array_merge($jsFiles, $jsb2->getUrls('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');
 	}
 
 
@@ -153,30 +153,30 @@ 
 	 * @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)
 	{
-		$paths = app( '\Aimeos\Shop\Base\Aimeos' )->get()->getI18nPaths();
+		$paths = app('\Aimeos\Shop\Base\Aimeos')->get()->getI18nPaths();
 		$langs = array();
 
-		if( !isset( $paths['admin'] ) ) {
-			return json_encode( array() );
+		if (!isset($paths['admin'])) {
+			return json_encode(array());
 		}
 
-		foreach( $paths['admin'] as $path )
+		foreach ($paths['admin'] as $path)
 		{
-			$iter = new \DirectoryIterator( $path );
+			$iter = new \DirectoryIterator($path);
 
-			foreach( $iter as $file )
+			foreach ($iter as $file)
 			{
 				$name = $file->getFilename();
 
-				if( preg_match('/^[a-z]{2,3}(_[A-Z]{2})?$/', $name ) ) {
+				if (preg_match('/^[a-z]{2,3}(_[A-Z]{2})?$/', $name)) {
 					$langs[$name] = null;
 				}
 			}
 		}
 
-		return json_encode( $this->getLanguages( $context, array_keys( $langs ) ) );
+		return json_encode($this->getLanguages($context, array_keys($langs)));
 	}
 
 
@@ -186,10 +186,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);
 	}
 
 
@@ -200,16 +200,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);
 	}
 
 
@@ -221,19 +221,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());
 	}
 
 
@@ -244,18 +244,18 @@ 
 	 * @param array $langIds List of language IDs
 	 * @return array List of associative lists with "id" and "label" as keys
 	 */
-	protected function getLanguages( \Aimeos\MShop\Context\Item\Iface $context, array $langIds )
+	protected function getLanguages(\Aimeos\MShop\Context\Item\Iface $context, array $langIds)
 	{
-		$languageManager = \Aimeos\MShop\Factory::createManager( $context, 'locale/language' );
+		$languageManager = \Aimeos\MShop\Factory::createManager($context, 'locale/language');
 		$result = array();
 
 		$search = $languageManager->createSearch();
-		$search->setConditions( $search->compare('==', 'locale.language.id', $langIds ) );
-		$search->setSortations( array( $search->sort( '-', 'locale.language.status' ), $search->sort( '+', 'locale.language.label' ) ) );
-		$langItems = $languageManager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'locale.language.id', $langIds));
+		$search->setSortations(array($search->sort('-', 'locale.language.status'), $search->sort('+', 'locale.language.label')));
+		$langItems = $languageManager->searchItems($search);
 
-		foreach( $langItems as $id => $item ) {
-			$result[] = array( 'id' => $id, 'label' => $item->getLabel() );
+		foreach ($langItems as $id => $item) {
+			$result[] = array('id' => $id, 'label' => $item->getLabel());
 		}
 
 		return $result;
@@ -269,12 +269,12 @@ 
 	 */
 	protected 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'];
 				}
 			}
@@ -292,17 +292,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/JsonadmController.php

Doc Comments -6 removed lines

@@ -27,7 +27,6 @@ 
 	 *
 	 * @param \Illuminate\Http\Request $request Request object
 	 * @param string Resource location, e.g. "product/stock/wareshouse"
-	 * @param string $sitecode Unique site code
 	 * @param integer|null $id Unique resource ID
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
@@ -48,7 +47,6 @@ 
 	 *
 	 * @param \Illuminate\Http\Request $request Request object
 	 * @param string Resource location, e.g. "product/stock/wareshouse"
-	 * @param string $sitecode Unique site code
 	 * @param integer|null $id Unique resource ID
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
@@ -69,7 +67,6 @@ 
 	 *
 	 * @param \Illuminate\Http\Request $request Request object
 	 * @param string Resource location, e.g. "product/stock/wareshouse"
-	 * @param string $sitecode Unique site code
 	 * @param integer|null $id Unique resource ID
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
@@ -90,7 +87,6 @@ 
 	 *
 	 * @param \Illuminate\Http\Request $request Request object
 	 * @param string Resource location, e.g. "product/stock/wareshouse"
-	 * @param string $sitecode Unique site code
 	 * @param integer $id Unique ID of the resource
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
@@ -111,7 +107,6 @@ 
 	 *
 	 * @param \Illuminate\Http\Request $request Request object
 	 * @param string Resource location, e.g. "product/stock/wareshouse"
-	 * @param string $sitecode Unique site code
 	 * @param integer|null $id Unique resource ID
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
@@ -132,7 +127,6 @@ 
 	 *
 	 * @param \Illuminate\Http\Request $request Request object
 	 * @param string Resource location, e.g. "product/stock/wareshouse"
-	 * @param string $sitecode Unique site code
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
 	public function optionsAction( Request $request, $site = 'default', $resource = '' )

Braces +1 added lines, -2 removed lines

@@ -207,8 +207,7 @@
 			$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();
 		}

Spacing +57 added lines, -57 removed lines

@@ -35,19 +35,19 @@ 
 	 * @param integer|null $id Unique resource ID
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
-	public function deleteAction( Request $request, $site = 'default', $resource, $id = null )
+	public function deleteAction(Request $request, $site = 'default', $resource, $id = null)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin' );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin');
 		}
 
 		$status = 500;
 		$header = $request->headers->all();
 
-		$cntl = $this->createController( $site, $resource );
-		$result = $cntl->delete( $request->getContent(), $header, $status );
+		$cntl = $this->createController($site, $resource);
+		$result = $cntl->delete($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -60,19 +60,19 @@ 
 	 * @param integer|null $id Unique resource ID
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
-	public function getAction( Request $request, $site = 'default', $resource, $id = null )
+	public function getAction(Request $request, $site = 'default', $resource, $id = null)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin' );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin');
 		}
 
 		$status = 500;
 		$header = $request->headers->all();
 
-		$cntl = $this->createController( $site, $resource );
-		$result = $cntl->get( $request->getContent(), $header, $status );
+		$cntl = $this->createController($site, $resource);
+		$result = $cntl->get($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -85,19 +85,19 @@ 
 	 * @param integer|null $id Unique resource ID
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
-	public function patchAction( Request $request, $site = 'default', $resource, $id = null )
+	public function patchAction(Request $request, $site = 'default', $resource, $id = null)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin' );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin');
 		}
 
 		$status = 500;
 		$header = $request->headers->all();
 
-		$cntl = $this->createController( $site, $resource );
-		$result = $cntl->patch( $request->getContent(), $header, $status );
+		$cntl = $this->createController($site, $resource);
+		$result = $cntl->patch($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -110,19 +110,19 @@ 
 	 * @param integer $id Unique ID of the resource
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
-	public function postAction( Request $request, $site = 'default', $resource, $id = null )
+	public function postAction(Request $request, $site = 'default', $resource, $id = null)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin' );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin');
 		}
 
 		$status = 500;
 		$header = $request->headers->all();
 
-		$cntl = $this->createController( $site, $resource );
-		$result = $cntl->post( $request->getContent(), $header, $status );
+		$cntl = $this->createController($site, $resource);
+		$result = $cntl->post($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -135,19 +135,19 @@ 
 	 * @param integer|null $id Unique resource ID
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
-	public function putAction( Request $request, $site = 'default', $resource, $id = null )
+	public function putAction(Request $request, $site = 'default', $resource, $id = null)
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin' );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin');
 		}
 
 		$status = 500;
 		$header = $request->headers->all();
 
-		$cntl = $this->createController( $site, $resource );
-		$result = $cntl->put( $request->getContent(), $header, $status );
+		$cntl = $this->createController($site, $resource);
+		$result = $cntl->put($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -159,19 +159,19 @@ 
 	 * @param string $sitecode Unique site code
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
-	public function optionsAction( Request $request, $site = 'default', $resource = '' )
+	public function optionsAction(Request $request, $site = 'default', $resource = '')
 	{
-		if( config( 'shop.authorize', true ) ) {
-			$this->authorize( 'admin' );
+		if (config('shop.authorize', true)) {
+			$this->authorize('admin');
 		}
 
 		$status = 500;
 		$header = $request->headers->all();
 
-		$cntl = $this->createController( $site, $resource );
-		$result = $cntl->options( $request->getContent(), $header, $status );
+		$cntl = $this->createController($site, $resource);
+		$result = $cntl->options($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -181,20 +181,20 @@ 
 	 * @param string $sitecode Unique site code
 	 * @return \Aimeos\MShop\Context\Item\Iface Context item
 	 */
-	protected function createController( $sitecode, $resource )
+	protected function createController($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( 'controller/jsonadm/templates' );
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
+		$templatePaths = $aimeos->getCustomPaths('controller/jsonadm/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\Controller\JsonAdm\Factory::createController( $context, $templatePaths, $resource );
+		return \Aimeos\Controller\JsonAdm\Factory::createController($context, $templatePaths, $resource);
 	}
 
 
@@ -206,12 +206,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;
@@ -226,23 +226,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, $lang )
+	protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode, $lang)
 	{
-		$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 +4 added lines, -4 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;

src/Aimeos/Shop/Base/I18n.php

Spacing +9 added lines, -9 removed lines

@@ -40,7 +40,7 @@ 
 	 * @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object
 	 * @param \Illuminate\Contracts\Config\Repository $config Configuration object
 	 */
-	public function __construct( \Aimeos\Shop\Base\Aimeos $aimeos, \Illuminate\Contracts\Config\Repository $config )
+	public function __construct(\Aimeos\Shop\Base\Aimeos $aimeos, \Illuminate\Contracts\Config\Repository $config)
 	{
 		$this->aimeos = $aimeos;
 		$this->config = $config;
@@ -53,22 +53,22 @@ 
 	 * @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\Zend2( $i18nPaths, 'gettext', $langid, array( 'disableNotices' => true ) );
+				$i18n = new \Aimeos\MW\Translation\Zend2($i18nPaths, 'gettext', $langid, array('disableNotices' => true));
 
-				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;

src/Aimeos/Shop/Base/View.php

Braces +1 added lines, -2 removed lines

@@ -39,8 +39,7 @@
 
 			$i18n = app('\Aimeos\Shop\Base\I18n')->get( array( $locale ) );
 			$translation = $i18n[$locale];
-		}
-		else
+		} else
 		{
 			$translation = new \Aimeos\MW\Translation\None( 'en' );
 		}

Spacing +24 added lines, -24 removed lines

@@ -26,48 +26,48 @@ 
 	 * @param string|null $locale Code of the current language or null for no translation
 	 * @return \Aimeos\MW\View\Iface View object
 	 */
-	public function create( \Aimeos\MW\Config\Iface $config, array $templatePaths, $locale = null )
+	public function create(\Aimeos\MW\Config\Iface $config, array $templatePaths, $locale = null)
 	{
 		$params = $fixed = array();
 
-		if( $locale !== null )
+		if ($locale !== null)
 		{
 			$params = \Route::current()->parameters() + \Input::all();
 			$fixed = $this->getFixedParams();
 
-			$i18n = app('\Aimeos\Shop\Base\I18n')->get( array( $locale ) );
+			$i18n = app('\Aimeos\Shop\Base\I18n')->get(array($locale));
 			$translation = $i18n[$locale];
 		}
 		else
 		{
-			$translation = new \Aimeos\MW\Translation\None( 'en' );
+			$translation = new \Aimeos\MW\Translation\None('en');
 		}
 
 
-		$view = new \Aimeos\MW\View\Standard( $templatePaths );
+		$view = new \Aimeos\MW\View\Standard($templatePaths);
 
-		$helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation );
-		$view->addHelper( 'translate', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation);
+		$view->addHelper('translate', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, app('url'), $fixed );
-		$view->addHelper( 'url', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Url\Laravel5($view, app('url'), $fixed);
+		$view->addHelper('url', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params );
-		$view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params);
+		$view->addHelper('param', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config );
-		$view->addHelper( 'config', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config);
+		$view->addHelper('config', $helper);
 
-		$sepDec = $config->get( 'client/html/common/format/seperatorDecimal', '.' );
-		$sep1000 = $config->get( 'client/html/common/format/seperator1000', ' ' );
-		$helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000 );
-		$view->addHelper( 'number', $helper );
+		$sepDec = $config->get('client/html/common/format/seperatorDecimal', '.');
+		$sep1000 = $config->get('client/html/common/format/seperator1000', ' ');
+		$helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000);
+		$view->addHelper('number', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Request\Laravel5( $view, \Request::instance() );
-		$view->addHelper( 'request', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Request\Laravel5($view, \Request::instance());
+		$view->addHelper('request', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', csrf_token() );
-		$view->addHelper( 'csrf', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', csrf_token());
+		$view->addHelper('csrf', $helper);
 
 		return $view;
 	}
@@ -82,15 +82,15 @@ 
 	{
 		$fixed = array();
 
-		if( ( $value = \Route::input( 'site' ) ) !== null ) {
+		if (($value = \Route::input('site')) !== null) {
 			$fixed['site'] = $value;
 		}
 
-		if( ( $value = \Route::input( 'locale' ) ) !== null ) {
+		if (($value = \Route::input('locale')) !== null) {
 			$fixed['locale'] = $value;
 		}
 
-		if( ( $value = \Route::input( 'currency' ) ) !== null ) {
+		if (($value = \Route::input('currency')) !== null) {
 			$fixed['currency'] = $value;
 		}
 

src/Aimeos/Shop/Command/AbstractCommand.php

Spacing +7 added lines, -7 removed lines

@@ -22,19 +22,19 @@
 	 * @param string|array $sites Unique site codes
 	 * @return \Aimeos\MShop\Locale\Item\Site\Iface[] List of site items
 	 */
-	protected function getSiteItems( \Aimeos\MShop\Context\Item\Iface $context, $sites )
+	protected function getSiteItems(\Aimeos\MShop\Context\Item\Iface $context, $sites)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');
 		$search = $manager->createSearch();
 
-		if( is_scalar( $sites ) && $sites != '' ) {
-			$sites = explode( ' ', $sites );
+		if (is_scalar($sites) && $sites != '') {
+			$sites = explode(' ', $sites);
 		}
 
-		if( !empty( $sites ) ) {
-			$search->setConditions( $search->compare( '==', 'locale.site.code', $sites ) );
+		if (!empty($sites)) {
+			$search->setConditions($search->compare('==', 'locale.site.code', $sites));
 		}
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }
\ No newline at end of file

src/Aimeos/Shop/Command/CacheCommand.php

Spacing +11 added lines, -11 removed lines

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

@@ -36,21 +36,21 @@ 
 	 */
 	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();
 			}
 		}
 	}
@@ -64,8 +64,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)'),
 		);
 	}
 
@@ -89,17 +89,17 @@ 
 	{
 		$lv = $this->getLaravel();
 
-		$context = $lv->make( '\Aimeos\Shop\Base\Context' )->get( false );
-		$tmplPaths = $lv->make( '\Aimeos\Shop\Base\Aimeos' )->get()->getCustomPaths( 'controller/jobs/layouts' );
-		$view = $lv->make( '\Aimeos\Shop\Base\View' )->create( $context->getConfig(), $tmplPaths );
+		$context = $lv->make('\Aimeos\Shop\Base\Context')->get(false);
+		$tmplPaths = $lv->make('\Aimeos\Shop\Base\Aimeos')->get()->getCustomPaths('controller/jobs/layouts');
+		$view = $lv->make('\Aimeos\Shop\Base\View')->create($context->getConfig(), $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 +32 added lines, -32 removed lines

@@ -35,18 +35,18 @@ 
 	 * @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;
 
-				if( file_exists( $file ) === true && ( include_once $file ) !== false ) {
+				if (file_exists($file) === true && (include_once $file) !== false) {
 					return true;
 				}
 			}
@@ -63,33 +63,33 @@ 
 	 */
 	public function fire()
 	{
-		$ctx = $this->getLaravel()->make( '\Aimeos\Shop\Base\Context' )->get( false );
-		$ctx->setEditor( 'aimeos:setup' );
+		$ctx = $this->getLaravel()->make('\Aimeos\Shop\Base\Context')->get(false);
+		$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));
 
-		$manager->run( 'mysql' );
+		$manager->run('mysql');
 	}
 
 
@@ -101,8 +101,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'),
 		);
 	}
 
@@ -115,7 +115,7 @@ 
 	protected function getOptions()
 	{
 		return array(
-			array( 'option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array() ),
+			array('option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array()),
 		);
 	}
 
@@ -126,14 +126,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]);
 			}
 		}
 
@@ -148,12 +148,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( $name, $value );
+			list($name, $value) = explode(':', $option);
+			$conf->set($name, $value);
 		}
 	}
 }