Completed
Pull Request — master (#231)
by
unknown
08:42
created
src/helpers.php 1 patch
Indentation   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -9,57 +9,57 @@
 block discarded – undo
9 9
 
10 10
 if( !function_exists( 'aiconfig' ) )
11 11
 {
12
-    /**
13
-     * Returns the configuration setting for the given key
14
-     *
15
-     * @param string $key Configuration key
16
-     * @param mixed $default Default value if the configuration key isn't found
17
-     * @return mixed Configuration value
18
-     */
19
-    function aiconfig( $key, $default = null )
20
-    {
21
-        return app( '\Aimeos\Shop\Base\Config' )->get()->get( $key, $default );
22
-    }
12
+	/**
13
+	 * Returns the configuration setting for the given key
14
+	 *
15
+	 * @param string $key Configuration key
16
+	 * @param mixed $default Default value if the configuration key isn't found
17
+	 * @return mixed Configuration value
18
+	 */
19
+	function aiconfig( $key, $default = null )
20
+	{
21
+		return app( '\Aimeos\Shop\Base\Config' )->get()->get( $key, $default );
22
+	}
23 23
 }
24 24
 
25 25
 
26 26
 if( !function_exists( 'aitrans' ) )
27 27
 {
28
-    /**
29
-     * Translates the given message
30
-     *
31
-     * @param string $singular Message to translate
32
-     * @param array $params List of paramters for replacing the placeholders in that order
33
-     * @param string $domain Translation domain
34
-     * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US"
35
-     * @return string Translated string
36
-     */
37
-    function aitrans( $singular, array $params = array(), $domain = 'client', $locale = null )
38
-    {
39
-        $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale );
28
+	/**
29
+	 * Translates the given message
30
+	 *
31
+	 * @param string $singular Message to translate
32
+	 * @param array $params List of paramters for replacing the placeholders in that order
33
+	 * @param string $domain Translation domain
34
+	 * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US"
35
+	 * @return string Translated string
36
+	 */
37
+	function aitrans( $singular, array $params = array(), $domain = 'client', $locale = null )
38
+	{
39
+		$i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale );
40 40
 
41
-        return vsprintf( $i18n->dt( $domain, $singular ), $params );
42
-    }
41
+		return vsprintf( $i18n->dt( $domain, $singular ), $params );
42
+	}
43 43
 }
44 44
 
45 45
 
46 46
 if( !function_exists( 'aitransplural' ) )
47 47
 {
48
-    /**
49
-     * Translates the given messages based on the number
50
-     *
51
-     * @param string $singular Message to translate
52
-     * @param string $plural Message for plural translations
53
-     * @param integer $number Count of items to chose the correct plural translation
54
-     * @param array $params List of paramters for replacing the placeholders in that order
55
-     * @param string $domain Translation domain
56
-     * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US"
57
-     * @return string Translated string
58
-     */
59
-    function aitransplural( $singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null )
60
-    {
61
-        $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale );
48
+	/**
49
+	 * Translates the given messages based on the number
50
+	 *
51
+	 * @param string $singular Message to translate
52
+	 * @param string $plural Message for plural translations
53
+	 * @param integer $number Count of items to chose the correct plural translation
54
+	 * @param array $params List of paramters for replacing the placeholders in that order
55
+	 * @param string $domain Translation domain
56
+	 * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US"
57
+	 * @return string Translated string
58
+	 */
59
+	function aitransplural( $singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null )
60
+	{
61
+		$i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale );
62 62
 
63
-        return vsprintf( $i18n->dn( $domain, $singular, $plural, $number ), $params );
64
-    }
63
+		return vsprintf( $i18n->dn( $domain, $singular, $plural, $number ), $params );
64
+	}
65 65
 }
Please login to merge, or discard this patch.
src/Aimeos/Shop/Command/AccountCommand.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -196,8 +196,7 @@
 block discarded – undo
196 196
 		try
197 197
 		{
198 198
 			$item = $manager->findItem( $code );
199
-		}
200
-		catch( \Aimeos\MShop\Exception $e )
199
+		} catch( \Aimeos\MShop\Exception $e )
201 200
 		{
202 201
 			$item = $manager->createItem();
203 202
 			$item->setLabel( $code );
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/View.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -100,8 +100,7 @@  discard block
 block discarded – undo
100 100
 			|| ( ( $user = \Illuminate\Support\Facades\Auth::user() ) !== null && $user->superuser )
101 101
 		) {
102 102
 			$helper = new \Aimeos\MW\View\Helper\Access\All( $view );
103
-		}
104
-		else
103
+		} else
105 104
 		{
106 105
 			$support = $this->support;
107 106
 
@@ -245,8 +244,7 @@  discard block
 block discarded – undo
245 244
 		{
246 245
 			$i18n = $this->i18n->get( array( $locale ) );
247 246
 			$translation = $i18n[$locale];
248
-		}
249
-		else
247
+		} else
250 248
 		{
251 249
 			$translation = new \Aimeos\MW\Translation\None( 'en' );
252 250
 		}
Please login to merge, or discard this patch.