FATCHIP-GmbH / plugin-shopware5-klarna-checkout

Components/Klarna/Language.php

Spacing +166 added lines, -166 removed lines

@@ -129,172 +129,172 @@
      * @var array
      */
     private static $_languages = array(
-        'AA' => 1,    // Afar
-        'AB' => 2,    // Abkhazian
-        'AE' => 3,    // Avestan
-        'AF' => 4,    // Afrikaans
-        'AM' => 5,    // Amharic
-        'AR' => 6,    // Arabic
-        'AS' => 7,    // Assamese
-        'AY' => 8,    // Aymara
-        'AZ' => 9,    // Azerbaijani
-        'BA' => 10,    // Bashkir
-        'BE' => 11,    // Byelorussian; Belarusian
-        'BG' => 12,    // Bulgarian
-        'BH' => 13,    // Bihari
-        'BI' => 14,    // Bislama
-        'BN' => 15,    // Bengali; Bangla
-        'BO' => 16,    // Tibetan
-        'BR' => 17,    // Breton
-        'BS' => 18,    // Bosnian
-        'CA' => 19,    // Catalan
-        'CE' => 20,    // Chechen
-        'CH' => 21,    // Chamorro
-        'CO' => 22,    // Corsican
-        'CS' => 23,    // Czech
-        'CU' => 24,    // Church Slavic
-        'CV' => 25,    // Chuvash
-        'CY' => 26,    // Welsh
-        'DA' => 27,    // Danish
-        'DE' => 28,    // German
-        'DZ' => 29,    // Dzongkha; Bhutani
-        'EL' => 30,    // Greek
-        'EN' => 31,    // English
-        'EO' => 32,    // Esperanto
-        'ES' => 33,    // Spanish
-        'ET' => 34,    // Estonian
-        'EU' => 35,    // Basque
-        'FA' => 36,    // Persian
-        'FI' => 37,    // Finnish
-        'FJ' => 38,    // Fijian; Fiji
-        'FO' => 39,    // Faroese
-        'FR' => 40,    // French
-        'FY' => 41,    // Frisian
-        'GA' => 42,    // Irish
-        'GD' => 43,    // Scots; Gaelic
-        'GL' => 44,    // Gallegan; Galician
-        'GN' => 45,    // Guarani
-        'GU' => 46,    // Gujarati
-        'GV' => 47,    // Manx
-        'HA' => 48,    // Hausa
-        'HE' => 49,    // Hebrew (formerly iw)
-        'HI' => 50,    // Hindi
-        'HO' => 51,    // Hiri Motu
-        'HR' => 52,    // Croatian
-        'HU' => 53,    // Hungarian
-        'HY' => 54,    // Armenian
-        'HZ' => 55,    // Herero
-        'IA' => 56,    // Interlingua
-        'ID' => 57,    // Indonesian (formerly in)
-        'IE' => 58,    // Interlingue
-        'IK' => 59,    // Inupiak
-        'IO' => 60,    // Ido
-        'IS' => 61,    // Icelandic
-        'IT' => 62,    // Italian
-        'IU' => 63,    // Inuktitut
-        'JA' => 64,    // Japanese
-        'JV' => 65,    // Javanese
-        'KA' => 66,    // Georgian
-        'KI' => 67,    // Kikuyu
-        'KJ' => 68,    // Kuanyama
-        'KK' => 69,    // Kazakh
-        'KL' => 70,    // Kalaallisut; Greenlandic
-        'KM' => 71,    // Khmer; Cambodian
-        'KN' => 72,    // Kannada
-        'KO' => 73,    // Korean
-        'KS' => 74,    // Kashmiri
-        'KU' => 75,    // Kurdish
-        'KV' => 76,    // Komi
-        'KW' => 77,    // Cornish
-        'KY' => 78,    // Kirghiz
-        'LA' => 79,    // Latin
-        'LB' => 80,    // Letzeburgesch
-        'LN' => 81,    // Lingala
-        'LO' => 82,    // Lao; Laotian
-        'LT' => 83,    // Lithuanian
-        'LV' => 84,    // Latvian; Lettish
-        'MG' => 85,    // Malagasy
-        'MH' => 86,    // Marshall
-        'MI' => 87,    // Maori
-        'MK' => 88,    // Macedonian
-        'ML' => 89,    // Malayalam
-        'MN' => 90,    // Mongolian
-        'MO' => 91,    // Moldavian
-        'MR' => 92,    // Marathi
-        'MS' => 93,    // Malay
-        'MT' => 94,    // Maltese
-        'MY' => 95,    // Burmese
-        'NA' => 96,    // Nauru
-        'NB' => 97,    // Norwegian Bokmål
-        'ND' => 98,    // Ndebele, North
-        'NE' => 99,    // Nepali
-        'NG' => 100,    // Ndonga
-        'NL' => 101,    // Dutch
-        'NN' => 102,    // Norwegian Nynorsk
-        'NO' => 103,    // Norwegian
-        'NR' => 104,    // Ndebele, South
-        'NV' => 105,    // Navajo
-        'NY' => 106,    // Chichewa; Nyanja
-        'OC' => 107,    // Occitan; Provençal
-        'OM' => 108,    // (Afan) Oromo
-        'OR' => 109,    // Oriya
-        'OS' => 110,    // Ossetian; Ossetic
-        'PA' => 111,    // Panjabi; Punjabi
-        'PI' => 112,    // Pali
-        'PL' => 113,    // Polish
-        'PS' => 114,    // Pashto, Pushto
-        'PT' => 115,    // Portuguese
-        'QU' => 116,    // Quechua
-        'RM' => 117,    // Rhaeto-Romance
-        'RN' => 118,    // Rundi; Kirundi
-        'RO' => 119,    // Romanian
-        'RU' => 120,    // Russian
-        'RW' => 121,    // Kinyarwanda
-        'SA' => 122,    // Sanskrit
-        'SC' => 123,    // Sardinian
-        'SD' => 124,    // Sindhi
-        'SE' => 125,    // Northern Sami
-        'SG' => 126,    // Sango; Sangro
-        'SI' => 127,    // Sinhalese
-        'SK' => 128,    // Slovak
-        'SL' => 129,    // Slovenian
-        'SM' => 130,    // Samoan
-        'SN' => 131,    // Shona
-        'SO' => 132,    // Somali
-        'SQ' => 133,    // Albanian
-        'SR' => 134,    // Serbian
-        'SS' => 135,    // Swati; Siswati
-        'ST' => 136,    // Sesotho; Sotho, Southern
-        'SU' => 137,    // Sundanese
-        'SV' => 138,    // Swedish
-        'SW' => 139,    // Swahili
-        'TA' => 140,    // Tamil
-        'TE' => 141,    // Telugu
-        'TG' => 142,    // Tajik
-        'TH' => 143,    // Thai
-        'TI' => 144,    // Tigrinya
-        'TK' => 145,    // Turkmen
-        'TL' => 146,    // Tagalog
-        'TN' => 147,    // Tswana; Setswana
-        'TO' => 148,    // Tongan
-        'TR' => 149,    // Turkish
-        'TS' => 150,    // Tsonga
-        'TT' => 151,    // Tatar
-        'TW' => 152,    // Twi
-        'TY' => 153,    // Tahitian
-        'UG' => 154,    // Uighur
-        'UK' => 155,    // Ukrainian
-        'UR' => 156,    // Urdu
-        'UZ' => 157,    // Uzbek
-        'VI' => 158,    // Vietnamese
-        'VO' => 159,    // Volapuk
-        'WA' => 160,    // Walloon
-        'WO' => 161,    // Wolof
-        'XH' => 162,    // Xhosa
-        'YI' => 163,    // Yiddish (formerly ji)
-        'YO' => 164,    // Yoruba
-        'ZA' => 165,    // Zhuang
-        'ZH' => 166,    // Chinese
+        'AA' => 1, // Afar
+        'AB' => 2, // Abkhazian
+        'AE' => 3, // Avestan
+        'AF' => 4, // Afrikaans
+        'AM' => 5, // Amharic
+        'AR' => 6, // Arabic
+        'AS' => 7, // Assamese
+        'AY' => 8, // Aymara
+        'AZ' => 9, // Azerbaijani
+        'BA' => 10, // Bashkir
+        'BE' => 11, // Byelorussian; Belarusian
+        'BG' => 12, // Bulgarian
+        'BH' => 13, // Bihari
+        'BI' => 14, // Bislama
+        'BN' => 15, // Bengali; Bangla
+        'BO' => 16, // Tibetan
+        'BR' => 17, // Breton
+        'BS' => 18, // Bosnian
+        'CA' => 19, // Catalan
+        'CE' => 20, // Chechen
+        'CH' => 21, // Chamorro
+        'CO' => 22, // Corsican
+        'CS' => 23, // Czech
+        'CU' => 24, // Church Slavic
+        'CV' => 25, // Chuvash
+        'CY' => 26, // Welsh
+        'DA' => 27, // Danish
+        'DE' => 28, // German
+        'DZ' => 29, // Dzongkha; Bhutani
+        'EL' => 30, // Greek
+        'EN' => 31, // English
+        'EO' => 32, // Esperanto
+        'ES' => 33, // Spanish
+        'ET' => 34, // Estonian
+        'EU' => 35, // Basque
+        'FA' => 36, // Persian
+        'FI' => 37, // Finnish
+        'FJ' => 38, // Fijian; Fiji
+        'FO' => 39, // Faroese
+        'FR' => 40, // French
+        'FY' => 41, // Frisian
+        'GA' => 42, // Irish
+        'GD' => 43, // Scots; Gaelic
+        'GL' => 44, // Gallegan; Galician
+        'GN' => 45, // Guarani
+        'GU' => 46, // Gujarati
+        'GV' => 47, // Manx
+        'HA' => 48, // Hausa
+        'HE' => 49, // Hebrew (formerly iw)
+        'HI' => 50, // Hindi
+        'HO' => 51, // Hiri Motu
+        'HR' => 52, // Croatian
+        'HU' => 53, // Hungarian
+        'HY' => 54, // Armenian
+        'HZ' => 55, // Herero
+        'IA' => 56, // Interlingua
+        'ID' => 57, // Indonesian (formerly in)
+        'IE' => 58, // Interlingue
+        'IK' => 59, // Inupiak
+        'IO' => 60, // Ido
+        'IS' => 61, // Icelandic
+        'IT' => 62, // Italian
+        'IU' => 63, // Inuktitut
+        'JA' => 64, // Japanese
+        'JV' => 65, // Javanese
+        'KA' => 66, // Georgian
+        'KI' => 67, // Kikuyu
+        'KJ' => 68, // Kuanyama
+        'KK' => 69, // Kazakh
+        'KL' => 70, // Kalaallisut; Greenlandic
+        'KM' => 71, // Khmer; Cambodian
+        'KN' => 72, // Kannada
+        'KO' => 73, // Korean
+        'KS' => 74, // Kashmiri
+        'KU' => 75, // Kurdish
+        'KV' => 76, // Komi
+        'KW' => 77, // Cornish
+        'KY' => 78, // Kirghiz
+        'LA' => 79, // Latin
+        'LB' => 80, // Letzeburgesch
+        'LN' => 81, // Lingala
+        'LO' => 82, // Lao; Laotian
+        'LT' => 83, // Lithuanian
+        'LV' => 84, // Latvian; Lettish
+        'MG' => 85, // Malagasy
+        'MH' => 86, // Marshall
+        'MI' => 87, // Maori
+        'MK' => 88, // Macedonian
+        'ML' => 89, // Malayalam
+        'MN' => 90, // Mongolian
+        'MO' => 91, // Moldavian
+        'MR' => 92, // Marathi
+        'MS' => 93, // Malay
+        'MT' => 94, // Maltese
+        'MY' => 95, // Burmese
+        'NA' => 96, // Nauru
+        'NB' => 97, // Norwegian Bokmål
+        'ND' => 98, // Ndebele, North
+        'NE' => 99, // Nepali
+        'NG' => 100, // Ndonga
+        'NL' => 101, // Dutch
+        'NN' => 102, // Norwegian Nynorsk
+        'NO' => 103, // Norwegian
+        'NR' => 104, // Ndebele, South
+        'NV' => 105, // Navajo
+        'NY' => 106, // Chichewa; Nyanja
+        'OC' => 107, // Occitan; Provençal
+        'OM' => 108, // (Afan) Oromo
+        'OR' => 109, // Oriya
+        'OS' => 110, // Ossetian; Ossetic
+        'PA' => 111, // Panjabi; Punjabi
+        'PI' => 112, // Pali
+        'PL' => 113, // Polish
+        'PS' => 114, // Pashto, Pushto
+        'PT' => 115, // Portuguese
+        'QU' => 116, // Quechua
+        'RM' => 117, // Rhaeto-Romance
+        'RN' => 118, // Rundi; Kirundi
+        'RO' => 119, // Romanian
+        'RU' => 120, // Russian
+        'RW' => 121, // Kinyarwanda
+        'SA' => 122, // Sanskrit
+        'SC' => 123, // Sardinian
+        'SD' => 124, // Sindhi
+        'SE' => 125, // Northern Sami
+        'SG' => 126, // Sango; Sangro
+        'SI' => 127, // Sinhalese
+        'SK' => 128, // Slovak
+        'SL' => 129, // Slovenian
+        'SM' => 130, // Samoan
+        'SN' => 131, // Shona
+        'SO' => 132, // Somali
+        'SQ' => 133, // Albanian
+        'SR' => 134, // Serbian
+        'SS' => 135, // Swati; Siswati
+        'ST' => 136, // Sesotho; Sotho, Southern
+        'SU' => 137, // Sundanese
+        'SV' => 138, // Swedish
+        'SW' => 139, // Swahili
+        'TA' => 140, // Tamil
+        'TE' => 141, // Telugu
+        'TG' => 142, // Tajik
+        'TH' => 143, // Thai
+        'TI' => 144, // Tigrinya
+        'TK' => 145, // Turkmen
+        'TL' => 146, // Tagalog
+        'TN' => 147, // Tswana; Setswana
+        'TO' => 148, // Tongan
+        'TR' => 149, // Turkish
+        'TS' => 150, // Tsonga
+        'TT' => 151, // Tatar
+        'TW' => 152, // Twi
+        'TY' => 153, // Tahitian
+        'UG' => 154, // Uighur
+        'UK' => 155, // Ukrainian
+        'UR' => 156, // Urdu
+        'UZ' => 157, // Uzbek
+        'VI' => 158, // Vietnamese
+        'VO' => 159, // Volapuk
+        'WA' => 160, // Walloon
+        'WO' => 161, // Wolof
+        'XH' => 162, // Xhosa
+        'YI' => 163, // Yiddish (formerly ji)
+        'YO' => 164, // Yoruba
+        'ZA' => 165, // Zhuang
+        'ZH' => 166, // Chinese
         'ZU' => 167     // Zulu
     );
 }

Components/KlarnaCheckout/Checkout.php

Spacing +20 added lines, -20 removed lines

@@ -26,25 +26,25 @@
  * @link      http://integration.klarna.com/
  */
 
-define('KLARNA_CHECKOUT_DIR', dirname(__file__) . '/Checkout');
+define('KLARNA_CHECKOUT_DIR', dirname(__file__).'/Checkout');
 
-require_once KLARNA_CHECKOUT_DIR . '/ConnectorInterface.php';
-require_once KLARNA_CHECKOUT_DIR . '/ResourceInterface.php';
-require_once KLARNA_CHECKOUT_DIR . '/Connector.php';
-require_once KLARNA_CHECKOUT_DIR . '/BasicConnector.php';
-require_once KLARNA_CHECKOUT_DIR . '/Order.php';
-require_once KLARNA_CHECKOUT_DIR . '/Digest.php';
-require_once KLARNA_CHECKOUT_DIR . '/Exception.php';
-require_once KLARNA_CHECKOUT_DIR . '/ConnectionErrorException.php';
-require_once KLARNA_CHECKOUT_DIR . '/ConnectorException.php';
-require_once KLARNA_CHECKOUT_DIR . '/UserAgent.php';
+require_once KLARNA_CHECKOUT_DIR.'/ConnectorInterface.php';
+require_once KLARNA_CHECKOUT_DIR.'/ResourceInterface.php';
+require_once KLARNA_CHECKOUT_DIR.'/Connector.php';
+require_once KLARNA_CHECKOUT_DIR.'/BasicConnector.php';
+require_once KLARNA_CHECKOUT_DIR.'/Order.php';
+require_once KLARNA_CHECKOUT_DIR.'/Digest.php';
+require_once KLARNA_CHECKOUT_DIR.'/Exception.php';
+require_once KLARNA_CHECKOUT_DIR.'/ConnectionErrorException.php';
+require_once KLARNA_CHECKOUT_DIR.'/ConnectorException.php';
+require_once KLARNA_CHECKOUT_DIR.'/UserAgent.php';
 
-require_once KLARNA_CHECKOUT_DIR . '/HTTP/TransportInterface.php';
-require_once KLARNA_CHECKOUT_DIR . '/HTTP/CURLHandleInterface.php';
-require_once KLARNA_CHECKOUT_DIR . '/HTTP/Request.php';
-require_once KLARNA_CHECKOUT_DIR . '/HTTP/Response.php';
-require_once KLARNA_CHECKOUT_DIR . '/HTTP/Transport.php';
-require_once KLARNA_CHECKOUT_DIR . '/HTTP/CURLTransport.php';
-require_once KLARNA_CHECKOUT_DIR . '/HTTP/CURLHeaders.php';
-require_once KLARNA_CHECKOUT_DIR . '/HTTP/CURLHandle.php';
-require_once KLARNA_CHECKOUT_DIR . '/HTTP/CURLFactory.php';
+require_once KLARNA_CHECKOUT_DIR.'/HTTP/TransportInterface.php';
+require_once KLARNA_CHECKOUT_DIR.'/HTTP/CURLHandleInterface.php';
+require_once KLARNA_CHECKOUT_DIR.'/HTTP/Request.php';
+require_once KLARNA_CHECKOUT_DIR.'/HTTP/Response.php';
+require_once KLARNA_CHECKOUT_DIR.'/HTTP/Transport.php';
+require_once KLARNA_CHECKOUT_DIR.'/HTTP/CURLTransport.php';
+require_once KLARNA_CHECKOUT_DIR.'/HTTP/CURLHeaders.php';
+require_once KLARNA_CHECKOUT_DIR.'/HTTP/CURLHandle.php';
+require_once KLARNA_CHECKOUT_DIR.'/HTTP/CURLFactory.php';

Components/KlarnaCheckout/Checkout/ConnectionErrorException.php

Indentation +11 added lines, -11 removed lines

@@ -26,17 +26,17 @@
  * @link      http://integration.klarna.com/
  */
 
- /**
-  * Connection exception
-  *
-  * @category  Payment
-  * @package   Klarna_Checkout
-  * @author    Rickard D. <rickard.dybeck@klarna.com>
-  * @author    Christer G. <christer.gustavsson@klarna.com>
-  * @copyright 2012 Klarna AB
-  * @license   http://www.apache.org/licenses/LICENSE-2.0 Apache license v2.0
-  * @link      http://integration.klarna.com/
-  */
+    /**
+     * Connection exception
+     *
+     * @category  Payment
+     * @package   Klarna_Checkout
+     * @author    Rickard D. <rickard.dybeck@klarna.com>
+     * @author    Christer G. <christer.gustavsson@klarna.com>
+     * @copyright 2012 Klarna AB
+     * @license   http://www.apache.org/licenses/LICENSE-2.0 Apache license v2.0
+     * @link      http://integration.klarna.com/
+     */
 class Klarna_Checkout_ConnectionErrorException extends Klarna_Checkout_Exception
 {
 

Components/KlarnaCheckout/Checkout/UserAgent.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
         foreach ($this->_fields as $key => $value) {
             $parts[] = "$key/{$value['name']}_{$value['version']}";
             if (array_key_exists('options', $value)) {
-                $parts[] = '(' . implode(' ; ', $value['options']) . ')';
+                $parts[] = '('.implode(' ; ', $value['options']).')';
             }
         }
         return implode(' ', $parts);

Components/KlarnaCheckout/Checkout/HTTP/CURLHeaders.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
         }
 
         $key = substr($header, 0, $pos);
-        $value = trim(substr($header, $pos+1));
+        $value = trim(substr($header, $pos + 1));
 
         $this->headers[$key] = trim($value);
 

Components/KlarnaCheckout/Checkout/HTTP/CURLTransport.php

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
         // Convert headers to cURL format.
         $requestHeaders = array();
         foreach ($request->getHeaders() as $key => $value) {
-            $requestHeaders[] = $key . ': ' . $value;
+            $requestHeaders[] = $key.': '.$value;
         }
 
         $curl->setOption(CURLOPT_HTTPHEADER, $requestHeaders);

Components/StreetSplitService.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
         $matches['streetNumber'] = trim($matches['streetNumber']);
 
         // remove unnecessary numeric indexes
-        unset($matches[0], $matches[1],$matches[2]);
+        unset($matches[0], $matches[1], $matches[2]);
 
         return $matches;
     }

Models/lightConnector.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
      */
     protected $transactionId = null;
     
-    protected $apiUrl = array('live'=>'https://api.klarna.com/','test'=>'https://api.playground.klarna.com/');
+    protected $apiUrl = array('live'=>'https://api.klarna.com/', 'test'=>'https://api.playground.klarna.com/');
 
     /**
      * Creates an instance of light connector

Bootstrap.php

Doc Comments +6 added lines, -5 removed lines

@@ -1678,7 +1678,7 @@ 
 
     /**
      *
-     * @return array
+     * @return string
      */
     public function getLabel()
     {
@@ -1715,7 +1715,7 @@ 
     /**
      * Creates and returns the klarna client for an event.
      *
-     * @return \Klarna_Checkout_Connector
+     * @return Klarna_Checkout_ConnectorInterface
      */
     public function onInitResourceKlarnaCheckoutConnector()
     {
@@ -1768,7 +1768,7 @@ 
 
     /**
      * @param string $requiredVersion
-     * @return bool|mixed
+     * @return boolean
      */
     protected function assertMinimumVersion($requiredVersion)
     {
@@ -1932,6 +1932,7 @@ 
      *
      * @param $config Enlight_Config
      * @param $lastName string
+     * @param boolean $userLoggedIn
      * @return bool
      */
     private function getShowLoginConfig($config, $userLoggedIn)
@@ -2035,7 +2036,7 @@ 
      * Helper method to get the correct order for the elements
      *
      * @param $config Enlight_Config
-     * @return array Array with the order of the elements
+     * @return string[] Array with the order of the elements
      */
     private function getPositionOrder($config)
     {
@@ -2334,7 +2335,7 @@ 
     /**
      * @param Shopware\Models\Payment\Payment $payment
      * @param $basket
-     * @return bool
+     * @return double
      */
     private function getFee($payment, $basket)
     {

Unused Use Statements -1 removed lines

@@ -22,7 +22,6 @@
  * our trademarks remain entirely with us.
  */
 
-use Doctrine\DBAL\Connection;
 use Shopware\Components\StreetSplitService;
 
 # Load dummy interface CSRFWhitelistAware for SW < 5.2

Indentation +10 added lines, -10 removed lines

@@ -491,7 +491,7 @@ 
         $args->setReturn($builder);
     }
 
-     public function onGetStreetSplitService()
+        public function onGetStreetSplitService()
     {
         $this->Application()->Loader()->registerNamespace(
             'Shopware\Components',
@@ -1364,12 +1364,12 @@ 
         /** @var Enlight_Components_Session_Namespace $session */
         $session = $this->Application()->Session();
 
-         // Switch User to external PaymentId after registration
-         if (isset($session['KlarnaExternalPaymentId'])) {
+            // Switch User to external PaymentId after registration
+            if (isset($session['KlarnaExternalPaymentId'])) {
                 $this->savePayment($session['KlarnaExternalPaymentId']);
         }
 
-       $view->assign('klarnaRedirect', $request->has('klarnaRedirect') && $request->getParam('klarnaRedirect') == 1);
+        $view->assign('klarnaRedirect', $request->has('klarnaRedirect') && $request->getParam('klarnaRedirect') == 1);
     }
     
 
@@ -1460,7 +1460,7 @@ 
             $userData['billingaddress']['country'] =$country;   
             $userData['shippingaddress']['countryID'] = $session['sChangedCountry'];
             $userData['billingaddress']['countryID'] = $session['sChangedCountry'];
-         }
+            }
         
         $orderVariables['sUserData'] = $userData;
         $testbreakpoint = 0;
@@ -2385,14 +2385,14 @@ 
                 } else {
                     $url = $front->Router()->assemble(array('controller' => 'index', 'module' => 'frontend'));
                 }
-		if (version_compare(Shopware::VERSION, '5.2.0', '>=')) {
+        if (version_compare(Shopware::VERSION, '5.2.0', '>=')) {
             # make sure me get only the image name, path is set in case of upgarde from SW.5.1 to 5.2
             $parts = explode('/', $media);
             $end = end($parts);
-			$media = $url . 'media/image/' . $end;
-		} else {
-	                $media = $url . $media;
-		}
+            $media = $url . 'media/image/' . $end;
+        } else {
+                    $media = $url . $media;
+        }
             }
 
             return $media;

Spacing +79 added lines, -79 removed lines

@@ -26,7 +26,7 @@ 
 use Shopware\Components\StreetSplitService;
 
 # Load dummy interface CSRFWhitelistAware for SW < 5.2
-require_once __DIR__ . '/Components/CSRFWhitelistAware.php';
+require_once __DIR__.'/Components/CSRFWhitelistAware.php';
 
 /**
  * Shopware Klarna Plugin
@@ -252,8 +252,8 @@ 
      */
     public function getKLarnaService() {
         if ($this->klarnaService === null) {
-            require_once __DIR__ . '/Components/Klarna/Klarna.php';
-            require_once __DIR__ . '/Components/Klarna/transport/xmlrpc-3.0.0.beta/lib/xmlrpc.inc';
+            require_once __DIR__.'/Components/Klarna/Klarna.php';
+            require_once __DIR__.'/Components/Klarna/transport/xmlrpc-3.0.0.beta/lib/xmlrpc.inc';
             $this->klarnaService = new Klarna();
         }
 
@@ -400,8 +400,8 @@ 
             
             $klarnaService = $this->getService();
 
-            $klarnaAddrBilling = $this->getKlarnaAddrByRawOrderData($orderDataRaw,'billing');
-            $klarnaAddrShipping = $this->getKlarnaAddrByRawOrderData($orderDataRaw,'shipping');
+            $klarnaAddrBilling = $this->getKlarnaAddrByRawOrderData($orderDataRaw, 'billing');
+            $klarnaAddrShipping = $this->getKlarnaAddrByRawOrderData($orderDataRaw, 'shipping');
 
             $transactionId = $orderDataRaw['transactionId'];
             
@@ -495,7 +495,7 @@ 
     {
         $this->Application()->Loader()->registerNamespace(
             'Shopware\Components',
-            __DIR__ . '/Components/'
+            __DIR__.'/Components/'
         );
 
         return new StreetSplitService();
@@ -509,27 +509,27 @@ 
      * @param mixed $mPrintableElement
      * @return void
      */
-    public function klarnaLog($message, $logLevelMessage=1, $mPrintableElement=null) {
+    public function klarnaLog($message, $logLevelMessage = 1, $mPrintableElement = null) {
         $configname = 'klarnaLogLevel';
         $elementId = Shopware()->Db()->fetchOne('SELECT id FROM s_core_config_elements WHERE name = ?', [$configname]);
         $logLevelConfigSetting = Shopware()->Db()->fetchOne('SELECT value FROM s_core_config_values WHERE element_id = ?', [$elementId]);
         $logLevelConfigSetting = unserialize($logLevelConfigSetting);
-        $logLevelSetting = (is_numeric($logLevelConfigSetting) && $logLevelConfigSetting >=0 && $logLevelConfigSetting <=4) ? (int)$logLevelConfigSetting : 1;
+        $logLevelSetting = (is_numeric($logLevelConfigSetting) && $logLevelConfigSetting >= 0 && $logLevelConfigSetting <= 4) ? (int) $logLevelConfigSetting : 1;
         
         if ($logLevelMessage <= $logLevelSetting) {
             $prefix = "[".date('Y-m-d H:i:s')."] ";
             $debugBacktrace = '';
             if ($logLevelSetting >= 4) {
-                $debugBacktrace = print_r(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS),true);
+                $debugBacktrace = print_r(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS), true);
             }
             $sPrintableElementMessage = '';
             if ($mPrintableElement !== null) {
-                $sPrintableElementMessage = print_r($mPrintableElement,true);
+                $sPrintableElementMessage = print_r($mPrintableElement, true);
             }
             $fullMessage = $prefix.$message."\n".$sPrintableElementMessage.$debugBacktrace;
             $shopPath = Shopware()->DocPath();
             $logfilePath = $shopPath.'/var/log/klarnaTrace.log';
-            $fileHandler = fopen($logfilePath,'a');
+            $fileHandler = fopen($logfilePath, 'a');
             fwrite($fileHandler, $fullMessage);
             fclose($fileHandler);
         }
@@ -555,7 +555,7 @@ 
             $country = $repository->findOneBy(array('id' => $baseData['countryId']));
             $countryiso = $country->getIso();
 
-            $klarnaAddr =  new KlarnaAddr();
+            $klarnaAddr = new KlarnaAddr();
             $klarnaAddr->setEmail($orderDataRaw['customerEmail']);
             $klarnaAddr->setFirstName($baseData['firstName']);
             $klarnaAddr->setLastName($baseData['lastName']);
@@ -570,7 +570,7 @@ 
             $klarnaAddr->setCountry($countryiso);
         }
 
-        $this->klarnaLog('Update order address from backend with following address data:',3,$klarnaAddr);
+        $this->klarnaLog('Update order address from backend with following address data:', 3, $klarnaAddr);
         return $klarnaAddr;
     }
 
@@ -598,10 +598,10 @@ 
             if ($index == count($addressParts) || $houseNumberFound) {
                 // at least last element should be streetnr
                 if (!empty($streetnr)) $streetnr .= ' ';
-                $streetnr .= (string)$addressPart;
+                $streetnr .= (string) $addressPart;
             }
-            else  {
-                $street .= (string)' '.$addressPart;
+            else {
+                $street .= (string) ' '.$addressPart;
             }
         }
 
@@ -1218,11 +1218,11 @@ 
     public function registerMyTemplateDir($isBackend = false)
     {
         if ($isBackend) {
-            $this->get('template')->addTemplateDir(__DIR__ . '/Views/', 'klarna');
+            $this->get('template')->addTemplateDir(__DIR__.'/Views/', 'klarna');
         } elseif ($this->isTemplateResponsive()) {
-            $this->get('template')->addTemplateDir(__DIR__ . '/Views/responsive', 'klarna');
+            $this->get('template')->addTemplateDir(__DIR__.'/Views/responsive', 'klarna');
         } else {
-            $this->get('template')->addTemplateDir(__DIR__ . '/Views/_emotion', 'klarna');
+            $this->get('template')->addTemplateDir(__DIR__.'/Views/_emotion', 'klarna');
         }
     }
 
@@ -1250,7 +1250,7 @@ 
     {
         $this->registerMyTemplateDir();
 
-        return __DIR__ . '/Controllers/Frontend/PaymentKlarna.php';
+        return __DIR__.'/Controllers/Frontend/PaymentKlarna.php';
     }
 
     /**
@@ -1262,10 +1262,10 @@ 
     {
         $this->registerMyTemplateDir(true);
         $this->Application()->Snippets()->addConfigDir(
-            __DIR__ . '/Snippets/'
+            __DIR__.'/Snippets/'
         );
 
-        return __DIR__ . '/Controllers/Backend/PaymentKlarna.php';
+        return __DIR__.'/Controllers/Backend/PaymentKlarna.php';
     }
 
     /**
@@ -1289,7 +1289,7 @@ 
 
         // just return in case kco payment is deactivated in backend
 
-        if (!$this->isKcoPaymentActive()){
+        if (!$this->isKcoPaymentActive()) {
             return;
         }
         $user = $view->getAssign('sUserData');
@@ -1300,7 +1300,7 @@ 
             && ($request->getActionName() == 'cart' || $request->getActionName() == 'ajaxCart')
         ) {
             $this->registerMyTemplateDir();
-            $view->assign('KlarnaEnableButton', (bool)$config->get('showKlarnaButton'));
+            $view->assign('KlarnaEnableButton', (bool) $config->get('showKlarnaButton'));
             $view->assign('KlarnaShowCheckoutButton', $this->getShowCheckoutButton($user));
             $view->assign('klarnaKcoPaymentActive', $this->isKlarnaKcoPaymentActive($user));
             $view->assign('KlarnaPaymentDescription', $this->getPayment()->getDescription());
@@ -1329,7 +1329,7 @@ 
             $view->assign('KlarnaMerchantId', $config->get('merchantId'));
             $view->assign('KlarnaHideCheckoutSteps', true);
             
-            if (version_compare(Shopware::VERSION, '5.2.0', '<')){
+            if (version_compare(Shopware::VERSION, '5.2.0', '<')) {
                 $view->assign('KlarnaSkipLoginFix', true);
             }
             if (!$this->isTemplateResponsive()) {
@@ -1390,7 +1390,7 @@ 
     public function addJsFiles()
     {
         $jsPath = array(
-            __DIR__ . '/Views/responsive/frontend/_public/src/js/jquery.klarna_checkout.js'
+            __DIR__.'/Views/responsive/frontend/_public/src/js/jquery.klarna_checkout.js'
         );
 
         return new Doctrine\Common\Collections\ArrayCollection($jsPath);
@@ -1449,15 +1449,15 @@ 
             $userData['additional']
         );
         
-        if (isset($session['sChangedCountry'])){
+        if (isset($session['sChangedCountry'])) {
             
             /** @var \Shopware\Components\Model\ModelManager $em */
             $em = $this->get('models');
 
             /** @var \Shopware\Models\Customer\Customer $customer */
             $country = $em->getRepository('Shopware\Models\Country\Country')->findOneBy(array('id' => $session['sChangedCountry']));            
-            $userData['shippingaddress']['country'] =$country;     
-            $userData['billingaddress']['country'] =$country;   
+            $userData['shippingaddress']['country'] = $country;     
+            $userData['billingaddress']['country'] = $country;   
             $userData['shippingaddress']['countryID'] = $session['sChangedCountry'];
             $userData['billingaddress']['countryID'] = $session['sChangedCountry'];
          }
@@ -1477,10 +1477,10 @@ 
         $this->klarnaLog("Entering Bootstrap::getCountryByShop", 3);
         $locale = explode('_', $locale);
         $locale = isset($locale[1]) ? $locale[1] : $locale[0];
-        $this->klarnaLog("Bootstrap::getCountryByShop locale to request for:".$locale,3);
+        $this->klarnaLog("Bootstrap::getCountryByShop locale to request for:".$locale, 3);
         $sql = 'SELECT id FROM s_core_countries WHERE countryiso=?';
         $countryId = Shopware()->Db()->fetchOne($sql, array($locale));
-        $countryId = ($countryId) ? (int)$countryId : null;
+        $countryId = ($countryId) ? (int) $countryId : null;
                 
         return $countryId;
     }
@@ -1511,7 +1511,7 @@ 
         $locale = $locale == 'nn-no' ? 'nb-no' : $locale;
 
         if ($locale == 'de-de') {
-            if($countryIso == 'CH') {
+            if ($countryIso == 'CH') {
                 $locale = 'de-ch';
             } elseif ($countryIso == 'AT') {
                 $locale = 'de-at';
@@ -1526,10 +1526,10 @@ 
         $config = $this->Config();
         $options = $this->getColorConfigOptions($config);
 
-        $options['allow_separate_shipping_address'] = (bool)$config->get('allowSeparateShippingAddress');
-        $options['packstation_enabled'] = (bool)$config->get('supportPackstation') && $allowPackstation;
-        $options['phone_mandatory'] = (bool)$config->get('mandatoryPhone');
-        $options['date_of_birth_mandatory'] = (bool)$config->get('mandatoryBirthday');
+        $options['allow_separate_shipping_address'] = (bool) $config->get('allowSeparateShippingAddress');
+        $options['packstation_enabled'] = (bool) $config->get('supportPackstation') && $allowPackstation;
+        $options['phone_mandatory'] = (bool) $config->get('mandatoryPhone');
+        $options['date_of_birth_mandatory'] = (bool) $config->get('mandatoryBirthday');
 
         if (!empty($dispatch)) {
             $options['shipping_details'] = $dispatch['description'];
@@ -1544,19 +1544,19 @@ 
         foreach ($basket['content'] as $index=>$basketItem) {
             // compatibility to shopware plugin custom products
             if (isset($basketItem['custom_product_prices'])) {
-                $basketItemPrice = (double)$basketItem['custom_product_prices']['total'];
+                $basketItemPrice = (double) $basketItem['custom_product_prices']['total'];
             }
             else {
-                $basketItemPrice = (double)str_replace(',', '.', $basketItem['price']);
+                $basketItemPrice = (double) str_replace(',', '.', $basketItem['price']);
             }
             $unitPrice = round($basketItemPrice * 100);
             $cart[] = array(
                 'type' => $unitPrice >= 0 ? 'physical' : 'discount',
                 'reference' => $basketItem['ordernumber'],
                 'name' => $basketItem['articlename'],
-                'quantity' => (int)$basketItem['quantity'],
-                'unit_price' => (int)$unitPrice,
-                'tax_rate' => (int)round($basketItem['tax_rate'] * 100)
+                'quantity' => (int) $basketItem['quantity'],
+                'unit_price' => (int) $unitPrice,
+                'tax_rate' => (int) round($basketItem['tax_rate'] * 100)
             );
         }
         if (!empty($basket['sShippingcosts'])) {
@@ -1567,8 +1567,8 @@ 
                 'reference' => 'SHIPPING',
                 'name' => 'Shipping Fee',
                 'quantity' => 1,
-                'unit_price' => (int)round($shippingAmount * 100),
-                'tax_rate' => (int)round($basket['sShippingcostsTax'] * 100),
+                'unit_price' => (int) round($shippingAmount * 100),
+                'tax_rate' => (int) round($basket['sShippingcostsTax'] * 100),
             );
         }
 
@@ -1599,7 +1599,7 @@ 
                 'action' => 'return',
                 'forceSecure' => true
             )
-        ) . "?transactionId={checkout.order.uri}";
+        )."?transactionId={checkout.order.uri}";
         $merchant['push_uri'] = $router->assemble(
             array(
                 'controller' => 'payment_klarna',
@@ -1607,7 +1607,7 @@ 
                 'forceSecure' => true,
                 'appendSession' => true
             )
-        ) . "&transactionId={checkout.order.uri}";
+        )."&transactionId={checkout.order.uri}";
         $merchant['back_to_store_uri'] = $router->assemble(
             array(
                 'controller' => 'index',
@@ -1620,41 +1620,41 @@ 
 
     public function getCheckoutAddress($user, $type = 'billing')
     {
-        if (empty($user[$type . 'address']['zipcode']) || $user[$type . 'address']['zipcode'] == '00000') {
+        if (empty($user[$type.'address']['zipcode']) || $user[$type.'address']['zipcode'] == '00000') {
             return array();
         }
 
         $address = array(
-            'given_name' => $user[$type . 'address']['firstname'],
-            'family_name' => $user[$type . 'address']['lastname'],
-            'postal_code' => $user[$type . 'address']['zipcode'],
-            'city' => $user[$type . 'address']['city'],
+            'given_name' => $user[$type.'address']['firstname'],
+            'family_name' => $user[$type.'address']['lastname'],
+            'postal_code' => $user[$type.'address']['zipcode'],
+            'city' => $user[$type.'address']['city'],
             'country' => $user['additional'][$type == 'billing' ? 'country' : 'countryShipping']['countryiso'],
             'email' => $user['additional']['user']['email'],
             'phone' => $user['billingaddress']['phone'],
         );
         $address['country'] = strtolower($address['country']);
         if ($address['country'] == 'de' || $address['country'] == 'nl') {
-            $address['title'] = $user[$type . 'address']['salutation'] == 'ms' ? 'Frau' : 'Herr';
+            $address['title'] = $user[$type.'address']['salutation'] == 'ms' ? 'Frau' : 'Herr';
             if ($this->assertMinimumVersion('5.0.0')) {
                 /** @var StreetSplitService $streetSplitService */
                 $streetSplitService = Shopware()->StreetSplitService();
-                $streetAndNumber = $streetSplitService->split($user[$type . 'address']['street']);
+                $streetAndNumber = $streetSplitService->split($user[$type.'address']['street']);
 
                 $address['street_name'] = $streetAndNumber['streetName'];
                 $address['street_number'] = $streetAndNumber['streetNumber'];
             } else {
-                $address['street_name'] = $user[$type . 'address']['street'];
-                $address['street_number'] = $user[$type . 'address']['streetnumber'];
+                $address['street_name'] = $user[$type.'address']['street'];
+                $address['street_number'] = $user[$type.'address']['streetnumber'];
             }
         } else {
             $address['street_address'] = trim(
-                $user[$type . 'address']['street'] . ' ' . $user[$type . 'address']['streetnumber']
+                $user[$type.'address']['street'].' '.$user[$type.'address']['streetnumber']
             );
         }
 
         // Make sure phone number is unset if empty
-        if ($address['phone'] === null){
+        if ($address['phone'] === null) {
             unset($address['phone']);
         }
         return $address;
@@ -1691,7 +1691,7 @@ 
      */
     public function getVersion()
     {
-        $info = json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'plugin.json'), true);
+        $info = json_decode(file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'plugin.json'), true);
 
         if ($info) {
             return $info['currentVersion'];
@@ -1708,7 +1708,7 @@ 
         return array(
             'version' => $this->getVersion(),
             'label' => $this->getLabel(),
-            'description' => file_get_contents(__DIR__ . '/info.txt')
+            'description' => file_get_contents(__DIR__.'/info.txt')
         );
     }
 
@@ -1719,7 +1719,7 @@ 
      */
     public function onInitResourceKlarnaCheckoutConnector()
     {
-        require_once __DIR__ . '/Components/KlarnaCheckout/Checkout.php';
+        require_once __DIR__.'/Components/KlarnaCheckout/Checkout.php';
         if ($this->Config()->get('testDrive')) {
             Klarna_Checkout_Order::$baseUri = 'https://checkout.testdrive.klarna.com/checkout/orders';
         } else {
@@ -1738,8 +1738,8 @@ 
      */
     public function onInitResourceKlarnaService()
     {
-        require_once __DIR__ . '/Components/Klarna/Klarna.php';
-        require_once __DIR__ . '/Components/Klarna/transport/xmlrpc-3.0.0.beta/lib/xmlrpc.inc';
+        require_once __DIR__.'/Components/Klarna/Klarna.php';
+        require_once __DIR__.'/Components/Klarna/transport/xmlrpc-3.0.0.beta/lib/xmlrpc.inc';
 
         $k = new Klarna();
         return $k;
@@ -1757,7 +1757,7 @@ 
             array(),
             //less files to compile
             array(
-                __DIR__ . '/Views/responsive/frontend/_public/src/less/all.less'
+                __DIR__.'/Views/responsive/frontend/_public/src/less/all.less'
             ),
             //import directory
             __DIR__
@@ -1824,7 +1824,7 @@ 
 
         $salutation = $form['register']['personal']['salutation'];
         if (!empty($salutation) && ($countryIso == 'DE' || $countryIso == 'NL')) {
-            $create['shipping_address']['title'] = ($salutation == 'ms' ? 'Frau' : 'Herr');//German names
+            $create['shipping_address']['title'] = ($salutation == 'ms' ? 'Frau' : 'Herr'); //German names
         }
 
         $billingStreet = $form['register']['billing']['street'];
@@ -1841,7 +1841,7 @@ 
                     $create['shipping_address']['street_number'] = $billingStreetNumber;
                 }
             } else {
-                $create['shipping_address']['street_address'] = $billingStreet . ' ' . $billingStreetNumber;
+                $create['shipping_address']['street_address'] = $billingStreet.' '.$billingStreetNumber;
             }
         }
 
@@ -1900,9 +1900,9 @@ 
         $view->assign('sPayments', $this->filterPayments($adminModule->sGetPaymentMeans()));
         $view->assign('sCountryList', $adminModule->sGetCountryList());
         $view->assign('KlarnaHideCheckoutSteps', true);
-        $view->assign('KlarnaShowB2bSelect', (bool)$config->get('showB2bSelect'));
-        $view->assign('KlarnaShowBasket', (bool)$config->get('showMiniBasket'));
-        $view->assign('KlarnaShowDispatch', (bool)$config->get('showDispatch'));
+        $view->assign('KlarnaShowB2bSelect', (bool) $config->get('showB2bSelect'));
+        $view->assign('KlarnaShowBasket', (bool) $config->get('showMiniBasket'));
+        $view->assign('KlarnaShowDispatch', (bool) $config->get('showDispatch'));
         $view->assign(
             'KlarnaCDNLink',
             $this->buildCDNLink()
@@ -1912,7 +1912,7 @@ 
             $view->sUserData['billingaddress']['lastname'] == 'Klarna Checkout'
         );
         $debugShowLogin = !empty($session->sUserId);
-        $debugShowLogin2 = $this->getShowLoginConfig($config,!empty($session->sUserId));
+        $debugShowLogin2 = $this->getShowLoginConfig($config, !empty($session->sUserId));
         $view->assign(
             'KlarnaShowLogin',
             $this->getShowLoginConfig($config, !empty($session->sUserId))
@@ -1936,7 +1936,7 @@ 
      */
     private function getShowLoginConfig($config, $userLoggedIn)
     {
-        return (bool)$config->get('showLoginPanel') && !($userLoggedIn);
+        return (bool) $config->get('showLoginPanel') && !($userLoggedIn);
     }
 
     /**demo
@@ -1978,7 +1978,7 @@ 
             $result = Shopware()->Db()->fetchAssoc($sql, array());
 
             // Load translations if available
-            $this->countries = array_map(function ($country) {
+            $this->countries = array_map(function($country) {
                 $country['id'] = $country['countryId'];
                 return Shopware()->Modules()->Admin()->sGetCountryTranslation($country);
             }, $result);
@@ -2099,7 +2099,7 @@ 
                 'phone' => $billingAddress['phone']
             ),
             'billing' => array(
-                'street' => $billingAddress['street_name'] . ' ' . $billingAddress['street_number'],
+                'street' => $billingAddress['street_name'].' '.$billingAddress['street_number'],
                 'zipcode' => $billingAddress['postal_code'],
                 'city' => $billingAddress['city']
             )
@@ -2290,13 +2290,13 @@ 
         /** @var Shopware\Models\Attribute\Payment $payment */
         foreach ($payments as $payment) {
             $paymentObj = $payment->getPayment();
-            if (is_null($paymentObj)){
+            if (is_null($paymentObj)) {
                 $paymentName = false;
             } else {
                 $paymentName = $paymentObj->getName();
             }
             
-            if(!$paymentName){
+            if (!$paymentName) {
                 continue;
             }            
             
@@ -2305,7 +2305,7 @@ 
             }
             $paymentArray = array(
                 'name' => $payment->getPayment()->getDescription(),
-                'redirect_uri' => $this->getRedirectUri() . '/paymentId/' . $payment->getPaymentId()
+                'redirect_uri' => $this->getRedirectUri().'/paymentId/'.$payment->getPaymentId()
             );
 
             if ($fee = $this->getFee($payment->getPayment(), $basket)) {
@@ -2316,7 +2316,7 @@ 
                 //Shorten the description to max. 500 characters
                 $description = strip_tags($description);
                 $description = preg_replace('#<!--.*-->#ms', '', $description);
-                $paymentArray['description'] = substr($description, 0, 497) . '...';
+                $paymentArray['description'] = substr($description, 0, 497).'...';
             }
 
             //Only add to external checkouts if an image is set and if the shop supports SSL
@@ -2374,14 +2374,14 @@ 
     {
         $media = $payment->getSwagKlarnaKlarnaMedia();
         if (!$payment->getSwagKlarnaShowInKlarnaIframe() || !empty($media)) {
-            if ($this->assertMinimumVersion('5.1') && version_compare(Shopware::VERSION, '5.2.0', '<=') ) {
+            if ($this->assertMinimumVersion('5.1') && version_compare(Shopware::VERSION, '5.2.0', '<=')) {
                 $media = $this->get('shopware_media.media_service')->getUrl($media);
             } else {
                 /** @var Enlight_Controller_Front $front */
                 $front = $this->get('front');
                 $request = $front->Request();
                 if ($request && $request->getHttpHost()) {
-                    $url = ($request->isSecure() ? 'https' : 'http') . '://' . $request->getHttpHost() . $request->getBasePath() . "/";
+                    $url = ($request->isSecure() ? 'https' : 'http').'://'.$request->getHttpHost().$request->getBasePath()."/";
                 } else {
                     $url = $front->Router()->assemble(array('controller' => 'index', 'module' => 'frontend'));
                 }
@@ -2389,9 +2389,9 @@ 
             # make sure me get only the image name, path is set in case of upgarde from SW.5.1 to 5.2
             $parts = explode('/', $media);
             $end = end($parts);
-			$media = $url . 'media/image/' . $end;
+			$media = $url.'media/image/'.$end;
 		} else {
-	                $media = $url . $media;
+	                $media = $url.$media;
 		}
             }
 

Braces +5 added lines, -5 removed lines

@@ -597,10 +597,11 @@ 
             $index++;
             if ($index == count($addressParts) || $houseNumberFound) {
                 // at least last element should be streetnr
-                if (!empty($streetnr)) $streetnr .= ' ';
+                if (!empty($streetnr)) {
+                    $streetnr .= ' ';
+                }
                 $streetnr .= (string)$addressPart;
-            }
-            else  {
+            } else  {
                 $street .= (string)' '.$addressPart;
             }
         }
@@ -1545,8 +1546,7 @@ 
             // compatibility to shopware plugin custom products
             if (isset($basketItem['custom_product_prices'])) {
                 $basketItemPrice = (double)$basketItem['custom_product_prices']['total'];
-            }
-            else {
+            } else {
                 $basketItemPrice = (double)str_replace(',', '.', $basketItem['price']);
             }
             $unitPrice = round($basketItemPrice * 100);