aimeos / aimeos-laravel

src/helpers.php

Indentation +41 added lines, -41 removed lines

@@ -9,57 +9,57 @@
 
 if( !function_exists( 'aiconfig' ) )
 {
-    /**
-     * Returns the configuration setting for the given key
-     *
-     * @param string $key Configuration key
-     * @param mixed $default Default value if the configuration key isn't found
-     * @return mixed Configuration value
-     */
-    function aiconfig( $key, $default = null )
-    {
-        return app( '\Aimeos\Shop\Base\Config' )->get()->get( $key, $default );
-    }
+	/**
+	 * Returns the configuration setting for the given key
+	 *
+	 * @param string $key Configuration key
+	 * @param mixed $default Default value if the configuration key isn't found
+	 * @return mixed Configuration value
+	 */
+	function aiconfig( $key, $default = null )
+	{
+		return app( '\Aimeos\Shop\Base\Config' )->get()->get( $key, $default );
+	}
 }
 
 
 if( !function_exists( 'aitrans' ) )
 {
-    /**
-     * Translates the given message
-     *
-     * @param string $singular Message to translate
-     * @param array $params List of paramters for replacing the placeholders in that order
-     * @param string $domain Translation domain
-     * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US"
-     * @return string Translated string
-     */
-    function aitrans( $singular, array $params = array(), $domain = 'client', $locale = null )
-    {
-        $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale );
+	/**
+	 * Translates the given message
+	 *
+	 * @param string $singular Message to translate
+	 * @param array $params List of paramters for replacing the placeholders in that order
+	 * @param string $domain Translation domain
+	 * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US"
+	 * @return string Translated string
+	 */
+	function aitrans( $singular, array $params = array(), $domain = 'client', $locale = null )
+	{
+		$i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale );
 
-        return vsprintf( $i18n->dt( $domain, $singular ), $params );
-    }
+		return vsprintf( $i18n->dt( $domain, $singular ), $params );
+	}
 }
 
 
 if( !function_exists( 'aitransplural' ) )
 {
-    /**
-     * Translates the given messages based on the number
-     *
-     * @param string $singular Message to translate
-     * @param string $plural Message for plural translations
-     * @param integer $number Count of items to chose the correct plural translation
-     * @param array $params List of paramters for replacing the placeholders in that order
-     * @param string $domain Translation domain
-     * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US"
-     * @return string Translated string
-     */
-    function aitransplural( $singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null )
-    {
-        $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale );
+	/**
+	 * Translates the given messages based on the number
+	 *
+	 * @param string $singular Message to translate
+	 * @param string $plural Message for plural translations
+	 * @param integer $number Count of items to chose the correct plural translation
+	 * @param array $params List of paramters for replacing the placeholders in that order
+	 * @param string $domain Translation domain
+	 * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US"
+	 * @return string Translated string
+	 */
+	function aitransplural( $singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null )
+	{
+		$i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale );
 
-        return vsprintf( $i18n->dn( $domain, $singular, $plural, $number ), $params );
-    }
+		return vsprintf( $i18n->dn( $domain, $singular, $plural, $number ), $params );
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 
-if( !function_exists( 'aiconfig' ) )
+if (!function_exists('aiconfig'))
 {
     /**
      * Returns the configuration setting for the given key
@@ -16,14 +16,14 @@ 
      * @param mixed $default Default value if the configuration key isn't found
      * @return mixed Configuration value
      */
-    function aiconfig( $key, $default = null )
+    function aiconfig($key, $default = null)
     {
-        return app( '\Aimeos\Shop\Base\Config' )->get()->get( $key, $default );
+        return app('\Aimeos\Shop\Base\Config')->get()->get($key, $default);
     }
 }
 
 
-if( !function_exists( 'aitrans' ) )
+if (!function_exists('aitrans'))
 {
     /**
      * Translates the given message
@@ -34,16 +34,16 @@ 
      * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US"
      * @return string Translated string
      */
-    function aitrans( $singular, array $params = array(), $domain = 'client', $locale = null )
+    function aitrans($singular, array $params = array(), $domain = 'client', $locale = null)
     {
-        $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale );
+        $i18n = app('\Aimeos\Shop\Base\Context')->get()->getI18n($locale);
 
-        return vsprintf( $i18n->dt( $domain, $singular ), $params );
+        return vsprintf($i18n->dt($domain, $singular), $params);
     }
 }
 
 
-if( !function_exists( 'aitransplural' ) )
+if (!function_exists('aitransplural'))
 {
     /**
      * Translates the given messages based on the number
@@ -56,10 +56,10 @@ 
      * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US"
      * @return string Translated string
      */
-    function aitransplural( $singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null )
+    function aitransplural($singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null)
     {
-        $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale );
+        $i18n = app('\Aimeos\Shop\Base\Context')->get()->getI18n($locale);
 
-        return vsprintf( $i18n->dn( $domain, $singular, $plural, $number ), $params );
+        return vsprintf($i18n->dn($domain, $singular, $plural, $number), $params);
     }
 }

src/Aimeos/Shop/Base/Aimeos.php

Spacing +11 added lines, -11 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,16 +47,16 @@ 
 	 */
 	public function get()
 	{
-		if( $this->object === null )
+		if ($this->object === null)
 		{
-			$dir = base_path( 'ext' );
+			$dir = base_path('ext');
 
-			if( !is_dir( $dir ) ) {
-				$dir = dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . DIRECTORY_SEPARATOR . 'ext';
+			if (!is_dir($dir)) {
+				$dir = dirname(dirname(dirname(dirname(__DIR__)))).DIRECTORY_SEPARATOR.'ext';
 			}
 
-			$extDirs = (array) $this->config->get( 'shop.extdir', $dir );
-			$this->object = new \Aimeos\Bootstrap( $extDirs, false );
+			$extDirs = (array) $this->config->get('shop.extdir', $dir);
+			$this->object = new \Aimeos\Bootstrap($extDirs, false);
 		}
 
 		return $this->object;
@@ -70,12 +70,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'];
 				}
 			}

src/Aimeos/Shop/Base/Config.php

Spacing +10 added lines, -10 removed lines

@@ -40,7 +40,7 @@ 
 	 * @param \Illuminate\Contracts\Config\Repository $config Configuration object
 	 * @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object
 	 */
-	public function __construct( \Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos )
+	public function __construct(\Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos)
 	{
 		$this->aimeos = $aimeos;
 		$this->config = $config;
@@ -53,23 +53,23 @@ 
 	 * @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')
 	{
-		if( !isset( $this->objects[$type] ) )
+		if (!isset($this->objects[$type]))
 		{
 			$configPaths = $this->aimeos->get()->getConfigPaths();
-			$cfgfile = dirname( dirname( dirname( __DIR__ ) ) ) . DIRECTORY_SEPARATOR . 'default.php';
+			$cfgfile = dirname(dirname(dirname(__DIR__))).DIRECTORY_SEPARATOR.'default.php';
 
-			$config = new \Aimeos\MW\Config\PHPArray( require $cfgfile, $configPaths );
+			$config = new \Aimeos\MW\Config\PHPArray(require $cfgfile, $configPaths);
 
-			if( $this->config->get( 'shop.apc_enabled', false ) == true ) {
-				$config = new \Aimeos\MW\Config\Decorator\APC( $config, $this->config->get( 'shop.apc_prefix', 'laravel:' ) );
+			if ($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);
 			}
 
 			$this->objects[$type] = $config;

src/Aimeos/Shop/Base/I18n.php

Spacing +9 added lines, -9 removed lines

@@ -40,7 +40,7 @@ 
 	 * @param \Illuminate\Contracts\Config\Repository $config Configuration object
 	 * @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object
 	 */
-	public function __construct( \Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos )
+	public function __construct(\Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos)
 	{
 		$this->aimeos = $aimeos;
 		$this->config = $config;
@@ -53,22 +53,22 @@ 
 	 * @param array $languageIds List of two letter ISO language IDs
 	 * @return \Aimeos\MW\Translation\Iface[] List of translation objects
 	 */
-	public function get( array $languageIds )
+	public function get(array $languageIds)
 	{
 		$i18nPaths = $this->aimeos->get()->getI18nPaths();
 
-		foreach( $languageIds as $langid )
+		foreach ($languageIds as $langid)
 		{
-			if( !isset( $this->i18n[$langid] ) )
+			if (!isset($this->i18n[$langid]))
 			{
-				$i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $langid );
+				$i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $langid);
 
-				if( $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->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

Spacing +62 added lines, -62 removed lines

@@ -47,8 +47,8 @@ 
 	 * @param \Aimeos\Shop\Base\I18n $i18n I18n object
 	 * @param \Aimeos\Shop\Base\Support $support Support object
 	 */
-	public function __construct( \Illuminate\Contracts\Config\Repository $config,
-		\Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support )
+	public function __construct(\Illuminate\Contracts\Config\Repository $config,
+		\Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support)
 	{
 		$this->i18n = $i18n;
 		$this->config = $config;
@@ -64,24 +64,24 @@ 
 	 * @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\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null )
+	public function create(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null)
 	{
-		$engine = new \Aimeos\MW\View\Engine\Blade( app( 'Illuminate\Contracts\View\Factory' ) );
-		$view = new \Aimeos\MW\View\Standard( $templatePaths, array( '.blade.php' => $engine ) );
+		$engine = new \Aimeos\MW\View\Engine\Blade(app('Illuminate\Contracts\View\Factory'));
+		$view = new \Aimeos\MW\View\Standard($templatePaths, array('.blade.php' => $engine));
 
 		$config = $context->getConfig();
 		$session = $context->getSession();
 
-		$this->addCsrf( $view );
-		$this->addAccess( $view, $context );
-		$this->addConfig( $view, $config );
-		$this->addNumber( $view, $config );
-		$this->addParam( $view );
-		$this->addRequest( $view );
-		$this->addResponse( $view );
-		$this->addSession( $view, $session );
-		$this->addTranslate( $view, $locale );
-		$this->addUrl( $view );
+		$this->addCsrf($view);
+		$this->addAccess($view, $context);
+		$this->addConfig($view, $config);
+		$this->addNumber($view, $config);
+		$this->addParam($view);
+		$this->addRequest($view);
+		$this->addResponse($view);
+		$this->addSession($view, $session);
+		$this->addTranslate($view, $locale);
+		$this->addUrl($view);
 
 		return $view;
 	}
@@ -94,25 +94,25 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addAccess( \Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addAccess(\Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context)
 	{
-		if( $this->config->get( 'shop.accessControl', true ) === false
-			|| ( ( $user = \Illuminate\Support\Facades\Auth::user() ) !== null && $user->superuser )
+		if ($this->config->get('shop.accessControl', true) === false
+			|| (($user = \Illuminate\Support\Facades\Auth::user()) !== null && $user->superuser)
 		) {
-			$helper = new \Aimeos\MW\View\Helper\Access\All( $view );
+			$helper = new \Aimeos\MW\View\Helper\Access\All($view);
 		}
 		else
 		{
 			$support = $this->support;
 
-			$fcn = function() use ( $support, $context ) {
-				return $support->getGroups( $context );
+			$fcn = function() use ($support, $context) {
+				return $support->getGroups($context);
 			};
 
-			$helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn );
+			$helper = new \Aimeos\MW\View\Helper\Access\Standard($view, $fcn);
 		}
 
-		$view->addHelper( 'access', $helper );
+		$view->addHelper('access', $helper);
 
 		return $view;
 	}
@@ -125,11 +125,11 @@ 
 	 * @param \Aimeos\MW\Config\Iface $config Configuration object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addConfig( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config )
+	protected function addConfig(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config)
 	{
-		$config = new \Aimeos\MW\Config\Decorator\Protect( clone $config, array( 'admin', 'client' ) );
-		$helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config );
-		$view->addHelper( 'config', $helper );
+		$config = new \Aimeos\MW\Config\Decorator\Protect(clone $config, array('admin', 'client'));
+		$helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config);
+		$view->addHelper('config', $helper);
 
 		return $view;
 	}
@@ -141,10 +141,10 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addCsrf( \Aimeos\MW\View\Iface $view )
+	protected function addCsrf(\Aimeos\MW\View\Iface $view)
 	{
-		$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;
 	}
@@ -157,14 +157,14 @@ 
 	 * @param \Aimeos\MW\Config\Iface $config Configuration object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addNumber( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config )
+	protected function addNumber(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config)
 	{
-		$sepDec = $config->get( 'client/html/common/format/separatorDecimal', '.' );
-		$sep1000 = $config->get( 'client/html/common/format/separator1000', ' ' );
-		$decimals = $config->get( 'client/html/common/format/decimals', 2 );
+		$sepDec = $config->get('client/html/common/format/separatorDecimal', '.');
+		$sep1000 = $config->get('client/html/common/format/separator1000', ' ');
+		$decimals = $config->get('client/html/common/format/decimals', 2);
 
-		$helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000, $decimals );
-		$view->addHelper( 'number', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000, $decimals);
+		$view->addHelper('number', $helper);
 
 		return $view;
 	}
@@ -176,11 +176,11 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addParam( \Aimeos\MW\View\Iface $view )
+	protected function addParam(\Aimeos\MW\View\Iface $view)
 	{
-		$params = ( Route::current() ? Route::current()->parameters() : array() ) + Input::all();
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params );
-		$view->addHelper( 'param', $helper );
+		$params = (Route::current() ? Route::current()->parameters() : array()) + Input::all();
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params);
+		$view->addHelper('param', $helper);
 
 		return $view;
 	}
@@ -192,10 +192,10 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addRequest( \Aimeos\MW\View\Iface $view )
+	protected function addRequest(\Aimeos\MW\View\Iface $view)
 	{
-		$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);
 
 		return $view;
 	}
@@ -207,10 +207,10 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addResponse( \Aimeos\MW\View\Iface $view )
+	protected function addResponse(\Aimeos\MW\View\Iface $view)
 	{
-		$helper = new \Aimeos\MW\View\Helper\Response\Laravel5( $view );
-		$view->addHelper( 'response', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Response\Laravel5($view);
+		$view->addHelper('response', $helper);
 
 		return $view;
 	}
@@ -223,10 +223,10 @@ 
 	 * @param \Aimeos\MW\Session\Iface $session Session object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addSession( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Session\Iface $session )
+	protected function addSession(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Session\Iface $session)
 	{
-		$helper = new \Aimeos\MW\View\Helper\Session\Standard( $view, $session );
-		$view->addHelper( 'session', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Session\Standard($view, $session);
+		$view->addHelper('session', $helper);
 
 		return $view;
 	}
@@ -239,20 +239,20 @@ 
 	 * @param string|null $locale ISO language code, e.g. "de" or "de_CH"
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addTranslate( \Aimeos\MW\View\Iface $view, $locale )
+	protected function addTranslate(\Aimeos\MW\View\Iface $view, $locale)
 	{
-		if( $locale !== null )
+		if ($locale !== null)
 		{
-			$i18n = $this->i18n->get( array( $locale ) );
+			$i18n = $this->i18n->get(array($locale));
 			$translation = $i18n[$locale];
 		}
 		else
 		{
-			$translation = new \Aimeos\MW\Translation\None( 'en' );
+			$translation = new \Aimeos\MW\Translation\None('en');
 		}
 
-		$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);
 
 		return $view;
 	}
@@ -264,27 +264,27 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addUrl( \Aimeos\MW\View\Iface $view )
+	protected function addUrl(\Aimeos\MW\View\Iface $view)
 	{
 		$fixed = array();
 
-		if( Route::current() )
+		if (Route::current())
 		{
-			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;
 			}
 		}
 
-		$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);
 
 		return $view;
 	}

src/views/jqadm/index.blade.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
 		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.css" />
 		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
 		<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" />
-		<link rel="stylesheet" href="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'lang' => 'en', 'type' => 'css' ) ); ?>" />
+		<link rel="stylesheet" href="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'lang' => 'en', 'type' => 'css')); ?>" />
 	</head>
 	<body>
 		<div class="app-menu" style="text-align: right; margin: 0 2.5%;">
@@ -33,6 +33,6 @@ 
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.9.1/adapters/jquery.js"></script>
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"></script>
 		<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js"></script>
-		<script src="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'lang' => 'en', 'type' => 'js' ) ); ?>"></script>
+		<script src="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'lang' => 'en', 'type' => 'js')); ?>"></script>
 	</body>
 </html>

src/Aimeos/Shop/Base/Context.php

Spacing +60 added lines, -60 removed lines

@@ -55,7 +55,7 @@ 
 	 * @param \Aimeos\Shop\Base\Locale $locale Locale object
 	 * @param \Aimeos\Shop\Base\I18n $i18n Internationalisation object
 	 */
-	public function __construct( \Illuminate\Session\Store $session, \Aimeos\Shop\Base\Config $config, \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\I18n $i18n )
+	public function __construct(\Illuminate\Session\Store $session, \Aimeos\Shop\Base\Config $config, \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\I18n $i18n)
 	{
 		$this->session = $session;
 		$this->config = $config;
@@ -71,36 +71,36 @@ 
 	 * @param string $type Configuration type, i.e. "frontend" or "backend" (deprecated, use \Aimeos\Shop\Base\Config)
 	 * @return \Aimeos\MShop\Context\Item\Iface Context object
 	 */
-	public function get( $locale = true, $type = 'frontend' )
+	public function get($locale = true, $type = 'frontend')
 	{
-		$config = $this->config->get( $type );
+		$config = $this->config->get($type);
 
-		if( $this->context === null )
+		if ($this->context === null)
 		{
 			$context = new \Aimeos\MShop\Context\Item\Standard();
-			$context->setConfig( $config );
-
-			$this->addDataBaseManager( $context );
-			$this->addFilesystemManager( $context );
-			$this->addMessageQueueManager( $context );
-			$this->addLogger( $context );
-			$this->addCache( $context );
-			$this->addMailer( $context);
-			$this->addProcess( $context );
-			$this->addSession( $context );
-			$this->addUser( $context);
-			$this->addGroups( $context);
+			$context->setConfig($config);
+
+			$this->addDataBaseManager($context);
+			$this->addFilesystemManager($context);
+			$this->addMessageQueueManager($context);
+			$this->addLogger($context);
+			$this->addCache($context);
+			$this->addMailer($context);
+			$this->addProcess($context);
+			$this->addSession($context);
+			$this->addUser($context);
+			$this->addGroups($context);
 
 			$this->context = $context;
 		}
 
-		$this->context->setConfig( $config );
+		$this->context->setConfig($config);
 
-		if( $locale === true )
+		if ($locale === true)
 		{
-			$localeItem = $this->locale->get( $this->context );
-			$this->context->setLocale( $localeItem );
-			$this->context->setI18n( $this->i18n->get( array( $localeItem->getLanguageId() ) ) );
+			$localeItem = $this->locale->get($this->context);
+			$this->context->setLocale($localeItem);
+			$this->context->setI18n($this->i18n->get(array($localeItem->getLanguageId())));
 		}
 
 		return $this->context;
@@ -113,11 +113,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object including config
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addCache( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addCache(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context );
+		$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context);
 
-		return $context->setCache( $cache );
+		return $context->setCache($cache);
 	}
 
 
@@ -127,11 +127,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addDatabaseManager( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addDatabaseManager(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$dbm = new \Aimeos\MW\DB\Manager\DBAL( $context->getConfig() );
+		$dbm = new \Aimeos\MW\DB\Manager\DBAL($context->getConfig());
 
-		return $context->setDatabaseManager( $dbm );
+		return $context->setDatabaseManager($dbm);
 	}
 
 
@@ -141,14 +141,14 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addFilesystemManager( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addFilesystemManager(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$config = $context->getConfig();
-		$path = storage_path( 'aimeos' );
+		$path = storage_path('aimeos');
 
-		$fs = new \Aimeos\MW\Filesystem\Manager\Laravel( app( 'filesystem' ), $config, $path );
+		$fs = new \Aimeos\MW\Filesystem\Manager\Laravel(app('filesystem'), $config, $path);
 
-		return $context->setFilesystemManager( $fs );
+		return $context->setFilesystemManager($fs);
 	}
 
 
@@ -158,11 +158,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addLogger( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addLogger(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$logger = \Aimeos\MAdmin::create( $context, 'log' );
+		$logger = \Aimeos\MAdmin::create($context, 'log');
 
-		return $context->setLogger( $logger );
+		return $context->setLogger($logger);
 	}
 
 
@@ -173,11 +173,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addMailer( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addMailer(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$mail = new \Aimeos\MW\Mail\Swift( function() { return app( 'mailer' )->getSwiftMailer(); } );
+		$mail = new \Aimeos\MW\Mail\Swift(function() { return app('mailer')->getSwiftMailer(); } );
 
-		return $context->setMail( $mail );
+		return $context->setMail($mail);
 	}
 
 
@@ -187,11 +187,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addMessageQueueManager( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addMessageQueueManager(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$mq = new \Aimeos\MW\MQueue\Manager\Standard( $context->getConfig() );
+		$mq = new \Aimeos\MW\MQueue\Manager\Standard($context->getConfig());
 
-		return $context->setMessageQueueManager( $mq );
+		return $context->setMessageQueueManager($mq);
 	}
 
 
@@ -201,16 +201,16 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addProcess( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addProcess(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$config = $context->getConfig();
-		$max = $config->get( 'pcntl_max', 4 );
-		$prio = $config->get( 'pcntl_priority', 19 );
+		$max = $config->get('pcntl_max', 4);
+		$prio = $config->get('pcntl_priority', 19);
 
-		$process = new \Aimeos\MW\Process\Pcntl( $max, $prio );
-		$process = new \Aimeos\MW\Process\Decorator\Check( $process );
+		$process = new \Aimeos\MW\Process\Pcntl($max, $prio);
+		$process = new \Aimeos\MW\Process\Decorator\Check($process);
 
-		return $context->setProcess( $process );
+		return $context->setProcess($process);
 	}
 
 
@@ -220,11 +220,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addSession( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addSession(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$session = new \Aimeos\MW\Session\Laravel5( $this->session );
+		$session = new \Aimeos\MW\Session\Laravel5($this->session);
 
-		return $context->setSession( $session );
+		return $context->setSession($session);
 	}
 
 
@@ -234,16 +234,16 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addUser( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addUser(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		if( ( $userid = Auth::id() ) !== null ) {
-			$context->setUserId( $userid );
+		if (($userid = Auth::id()) !== null) {
+			$context->setUserId($userid);
 		}
 
-		if( ( $user = Auth::user() ) !== null ) {
-			$context->setEditor( $user->name );
+		if (($user = Auth::user()) !== null) {
+			$context->setEditor($user->name);
 		} else {
-			$context->setEditor( \Request::ip() );
+			$context->setEditor(\Request::ip());
 		}
 
 		return $context;
@@ -256,14 +256,14 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addGroups( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addGroups(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		if( ( $userid = Auth::id() ) !== null )
+		if (($userid = Auth::id()) !== null)
 		{
-			$context->setGroupIds( function() use ( $context, $userid )
+			$context->setGroupIds(function() use ($context, $userid)
 			{
-				$manager = \Aimeos\MShop::create( $context, 'customer' );
-				return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups();
+				$manager = \Aimeos\MShop::create($context, 'customer');
+				return $manager->getItem($userid, array('customer/group'))->getGroups();
 			} );
 		}
 

src/Aimeos/Shop/Base/Support.php

Spacing +34 added lines, -34 removed lines

@@ -44,7 +44,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;
@@ -58,29 +58,29 @@ 
 	 * @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 checkUserGroup( \Illuminate\Foundation\Auth\User $user, $groupcodes )
+	public function checkUserGroup(\Illuminate\Foundation\Auth\User $user, $groupcodes)
 	{
-		$groups = ( is_array( $groupcodes ) ? implode( ',', $groupcodes ) : $groupcodes );
+		$groups = (is_array($groupcodes) ? implode(',', $groupcodes) : $groupcodes);
 
-		if( isset( $this->cache[$user->id][$groups] ) ) {
+		if (isset($this->cache[$user->id][$groups])) {
 			return $this->cache[$user->id][$groups];
 		}
 
 		$this->cache[$user->id][$groups] = false;
-		$context = $this->context->get( false );
+		$context = $this->context->get(false);
 
 		try {
-			$site = \Aimeos\MShop::create( $context, 'locale/site' )->getItem( $user->siteid )->getCode();
-		} catch( \Exception $e ) {
-			$site = ( Route::current() ? Route::input( 'site', Input::get( 'site', 'default' ) ) : 'default' );
+			$site = \Aimeos\MShop::create($context, 'locale/site')->getItem($user->siteid)->getCode();
+		} catch (\Exception $e) {
+			$site = (Route::current() ? Route::input('site', Input::get('site', 'default')) : 'default');
 		}
 
-		$context->setLocale( $this->locale->getBackend( $context, $site ) );
+		$context->setLocale($this->locale->getBackend($context, $site));
 
-		foreach( array_reverse( $context->getLocale()->getSitePath() ) as $siteid )
+		foreach (array_reverse($context->getLocale()->getSitePath()) as $siteid)
 		{
-			if( (string) $user->siteid === (string) $siteid ) {
-				$this->cache[$user->id][$groups] = $this->checkGroups( $context, $user->id, $groupcodes );
+			if ((string) $user->siteid === (string) $siteid) {
+				$this->cache[$user->id][$groups] = $this->checkGroups($context, $user->id, $groupcodes);
 			}
 		}
 
@@ -96,20 +96,20 @@ 
 	 * @return boolean True if user is part of the group, false if not
 	 * @deprecated Use checkUserGroup() instead
 	 */
-	public function checkGroup( $userid, $groupcodes )
+	public function checkGroup($userid, $groupcodes)
 	{
-		$groups = ( is_array( $groupcodes ) ? implode( ',', $groupcodes ) : $groupcodes );
+		$groups = (is_array($groupcodes) ? implode(',', $groupcodes) : $groupcodes);
 
-		if( isset( $this->cache[$userid][$groups] ) ) {
+		if (isset($this->cache[$userid][$groups])) {
 			return $this->cache[$userid][$groups];
 		}
 
-		$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));
 
-		return $this->cache[$userid][$groups] = $this->checkGroups( $context, $userid, $groupcodes );
+		return $this->cache[$userid][$groups] = $this->checkGroups($context, $userid, $groupcodes);
 	}
 
 
@@ -119,15 +119,15 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item
 	 * @return string[] List of group codes
 	 */
-	public function getGroups( \Aimeos\MShop\Context\Item\Iface $context )
+	public function getGroups(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$list = array();
-		$manager = \Aimeos\MShop::create( $context, 'customer/group' );
+		$manager = \Aimeos\MShop::create($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();
 		}
 
@@ -143,26 +143,26 @@ 
 	 * @param string[] $groupcodes List of group codes to check against
 	 * @return boolean True if the user is in one of the groups, false if not
 	 */
-	protected function checkGroups( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupcodes )
+	protected function checkGroups(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupcodes)
 	{
-		$manager = \Aimeos\MShop::create( $context, 'customer/group' );
+		$manager = \Aimeos\MShop::create($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::create( $context, 'customer/lists' );
+		$manager = \Aimeos\MShop::create($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));
 	}
 }

src/Aimeos/Shop/Base/Locale.php

Spacing +17 added lines, -17 removed lines

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