FATCHIP-GmbH / plugin-shopware5-klarna-checkout

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

Braces +14 added lines, -7 removed lines

@@ -5,7 +5,8 @@ 
  *
  * @author andre
  */
-class lightConnector {
+class lightConnector
+{
 
     /**
      * Connecting method
@@ -45,7 +46,8 @@ 
      * @param type $config
      * @param type $method
      */
-    public function __construct($config, $method = null) {
+    public function __construct($config, $method = null)
+    {
         parent::__construct();
         $this->method = $method;
         $this->config = $config;
@@ -57,7 +59,8 @@ 
      * @param string $method
      * @return void
      */
-    public function setMethod($method) {
+    public function setMethod($method)
+    {
         $this->method = $method;
     }
 
@@ -67,7 +70,8 @@ 
      * @param string $klarnaOrderId
      * @return void
      */
-    public function setKlarnaOrderId($klarnaOrderId) {
+    public function setKlarnaOrderId($klarnaOrderId)
+    {
         $this->klarnaOrderId = $klarnaOrderId;
     }
 
@@ -76,7 +80,8 @@ 
      * 
      * @param string $transactionId
      */
-    public function setTransactionId($transactionId) {
+    public function setTransactionId($transactionId)
+    {
         $this->transactionId = $transactionId;
     }
 
@@ -87,7 +92,8 @@ 
      * @param array $shippingAddress
      * @return void
      */
-    public function updateCustomerAddress($billingAddress, $shippingAddress = false) {
+    public function updateCustomerAddress($billingAddress, $shippingAddress = false)
+    {
         $aAddressParts = array('');
     }
     
@@ -96,7 +102,8 @@ 
      * 
      * @param array $data
      */
-    protected function setCall($data) {
+    protected function setCall($data)
+    {
         $testdrive = $this->config->get('testDrive');
         $url = ($testdrive) ? $this->apiUrl['test'] : $this->apiUrl['live'];
         

Bootstrap.php

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 +46 added lines, -46 removed lines

@@ -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'];
             
@@ -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')."] ";
+            $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;
+            $fullMessage = $prefix . $message . "\n" . $sPrintableElementMessage . $debugBacktrace;
             $shopPath = Shopware()->DocPath();
-            $logfilePath = $shopPath.'/var/log/klarnaTrace.log';
-            $fileHandler = fopen($logfilePath,'a');
+            $logfilePath = $shopPath . '/var/log/klarnaTrace.log';
+            $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;
             }
         }
 
@@ -610,7 +610,7 @@ 
             $streetnr_extension .= $baseData['additionalAddressLine1'];
         }
         if (!empty($baseData['additionalAddressLine2'])) {
-            $streetnr_extension .= "\n".$baseData['additionalAddressLine2'];
+            $streetnr_extension .= "\n" . $baseData['additionalAddressLine2'];
         }
 
         $return = array(
@@ -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()) {
@@ -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),
             );
         }
 
@@ -1654,7 +1654,7 @@ 
         }
 
         // Make sure phone number is unset if empty
-        if ($address['phone'] === null){
+        if ($address['phone'] === null) {
             unset($address['phone']);
         }
         return $address;
@@ -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'];
@@ -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
@@ -2295,13 +2295,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;
             }            
             
@@ -2379,7 +2379,7 @@ 
     {
         $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 */

Braces +28 added lines, -20 removed lines

@@ -250,7 +250,8 @@ 
      * @param void
      * @return \Klarna
      */
-    public function getKLarnaService() {
+    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';
@@ -266,7 +267,8 @@ 
      * @param void
      * @return object
      */
-    public function getKlarnaAddr() {
+    public function getKlarnaAddr()
+    {
         if ($this->klarnaAddr === null) {
             $this->klarnaAddr = new KlarnaAddr();
         }
@@ -380,7 +382,8 @@ 
      * @param Enlight_Hook_HookArgs $args
      * @return void
      */
-    public function onBackendOrderSaveAfter(Enlight_Hook_HookArgs $args) {
+    public function onBackendOrderSaveAfter(Enlight_Hook_HookArgs $args)
+    {
         $orderDataRaw = $args->getSubject()->Request()->getPost();
         $orderId = $orderDataRaw['id'];
         $paymentName = $orderDataRaw['payment'][0]['name'];
@@ -433,7 +436,8 @@ 
      * @param Enlight_Hook_HookArgs $args
      * @return void
      */
-    public function onBackendOrderDeleteAfter(Enlight_Hook_HookArgs $args) {
+    public function onBackendOrderDeleteAfter(Enlight_Hook_HookArgs $args)
+    {
         $orderDataRaw = $args->getSubject()->Request()->getPost();
         $paymentName = $orderDataRaw['payment'][0]['name'];
         
@@ -492,7 +496,7 @@ 
     }
 
      public function onGetStreetSplitService()
-    {
+     {
         $this->Application()->Loader()->registerNamespace(
             'Shopware\Components',
             __DIR__ . '/Components/'
@@ -509,7 +513,8 @@ 
      * @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]);
@@ -541,7 +546,8 @@ 
      * @param array $orderDataRaw
      * @param string $type
      */
-    protected function getKlarnaAddrByRawOrderData($orderDataRaw, $type) {
+    protected function getKlarnaAddrByRawOrderData($orderDataRaw, $type)
+    {
         $klarnaAddr = false;
         $baseData = (isset($orderDataRaw[$type][0])) ? $orderDataRaw[$type][0] : false;
         $baseData = $this->convertEncoding($baseData);
@@ -581,7 +587,8 @@ 
      * @param array $baseData
      * @return array
      */
-    protected function fetchStreetAndHouseNumber($baseData) {
+    protected function fetchStreetAndHouseNumber($baseData)
+    {
 
         $addressParts = explode(' ', $baseData['street']);
         $index = 0;
@@ -597,10 +604,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;
             }
         }
@@ -629,7 +637,8 @@ 
      * @param array $data
      * @return array
      */
-    protected function convertEncoding($data) {
+    protected function convertEncoding($data)
+    {
         $out = array();
         foreach ($data as $key=>$value) {
             if (is_string($value)) {
@@ -1289,7 +1298,7 @@ 
 
         // just return in case kco payment is deactivated in backend
 
-        if (!$this->isKcoPaymentActive()){
+        if (!$this->isKcoPaymentActive()) {
             return;
         }
         $user = $view->getAssign('sUserData');
@@ -1329,7 +1338,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()) {
@@ -1449,7 +1458,7 @@ 
             $userData['additional']
         );
         
-        if (isset($session['sChangedCountry'])){
+        if (isset($session['sChangedCountry'])) {
             
             /** @var \Shopware\Components\Model\ModelManager $em */
             $em = $this->get('models');
@@ -1545,8 +1554,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);
@@ -1654,7 +1662,7 @@ 
         }
 
         // Make sure phone number is unset if empty
-        if ($address['phone'] === null){
+        if ($address['phone'] === null) {
             unset($address['phone']);
         }
         return $address;
@@ -2295,13 +2303,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;
             }            
             

Doc Comments +5 added lines, -4 removed lines

@@ -1678,7 +1678,7 @@ 
 
     /**
      *
-     * @return array
+     * @return string
      */
     public function getLabel()
     {
@@ -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)
     {
@@ -2339,7 +2340,7 @@ 
     /**
      * @param Shopware\Models\Payment\Payment $payment
      * @param $basket
-     * @return bool
+     * @return double
      */
     private function getFee($payment, $basket)
     {

Controllers/Backend/PaymentKlarna.php

Doc Comments +2 added lines, -1 removed lines

@@ -43,6 +43,7 @@ 
 
     /**
      * {@inheritdoc}
+     * @param string $name
      */
     public function get($name)
     {
@@ -634,7 +635,7 @@ 
 
 
     /**
-     * @return array
+     * @return string[]
      */
     public function getWhitelistedCSRFActions()
     {

Spacing +1 added lines, -1 removed lines

@@ -449,7 +449,7 @@
         $orderId = $this->Request()->getParam('orderId');
         $this->registerShopByOrderId($orderId);
         $order = $this->getOrderById($orderId);
-        $value = (float)str_replace(',', '.', $this->Request()->getParam('value'));
+        $value = (float) str_replace(',', '.', $this->Request()->getParam('value'));
         $service = $this->getService($order);
 
         /** @noinspection PhpUndefinedMethodInspection */

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -101,7 +101,7 @@ 
 
         $order = $this->orderRepository->find($orderId);
         if ($order === null) {
-            throw new \Exception("Order {$orderId} not found");
+            throw new \Exception("order {$orderId} not found");
         }
         $shopId = $order->getLanguageIso();
         if ($shopId === null) {
@@ -110,7 +110,7 @@ 
             $shop = $repository->getActiveById($shopId);
         }
         if ($shop === null) {
-            throw new \Exception("Shop {$shopId} not found");
+            throw new \Exception("shop {$shopId} not found");
         }
         $shop->registerResources(Shopware()->Bootstrap());
         $this->modelManager->clear();

Controllers/Frontend/PaymentKlarna.php

Doc Comments +1 added lines

@@ -42,6 +42,7 @@
 
     /**
      * {@inheritdoc}
+     * @param string $name
      */
     public function get($name)
     {

Indentation +13 added lines, -13 removed lines

@@ -130,7 +130,7 @@ 
     public function showIframeAction()
     {
         $this->basket = $this->get('modules')->Basket()->sGetBasket();
-         $preFill = $this->config['preFillCheckout'];
+            $preFill = $this->config['preFillCheckout'];
         if ($this->isUserLoggedIn()) {
             $user = Shopware()->Modules()->Admin()->sGetUserData();
         }
@@ -288,7 +288,7 @@ 
 
         // Klarna Prefill checkBox
         if ($this->isUserLoggedIn()) {
-               $this->View()->assign('KlarnaPreFillSelect', !$this->session['klarnaPreFill']);
+                $this->View()->assign('KlarnaPreFillSelect', !$this->session['klarnaPreFill']);
         }
 
         // Iframe Backend Config
@@ -702,8 +702,8 @@ 
                     }
                     $module->sSYSTEM->_POST = $data['billing'];
                     if (Shopware::VERSION === '___VERSION___' || version_compare(Shopware::VERSION, '5.2.0', '>=')) {
-                         $userId = $session->offsetGet('sUserId');
-                         $this->updateBilling($userId, $data['billing']);
+                            $userId = $session->offsetGet('sUserId');
+                            $this->updateBilling($userId, $data['billing']);
                     } else {
                         $module->sUpdateBilling();
                     }
@@ -883,12 +883,12 @@ 
     }
 
 
-     /**
-     * Updates the shipping address
-     *
-     * @param int $userId
-     * @param array $shippingData
-     */
+        /**
+         * Updates the shipping address
+         *
+         * @param int $userId
+         * @param array $shippingData
+         */
     private function updateShipping($userId, $shippingData)
     {
         /** @var \Shopware\Components\Model\ModelManager $em */
@@ -901,7 +901,7 @@ 
         $addressold = $customer->getDefaultShippingAddress();
         $address = new \Shopware\Models\Customer\Address();
         
-         /** @var \Shopware\Models\Country\Country $country */
+            /** @var \Shopware\Models\Country\Country $country */
         $country = $addressold->getCountry();
         $shippingData['country'] = $country;
         if ($shippingData['phone'] === null) {
@@ -937,7 +937,7 @@ 
         /** @var \Shopware\Models\Customer\Address $address */
         $address = $customer->getDefaultBillingAddress();
         
-         /** @var \Shopware\Models\Country\Country $country */
+            /** @var \Shopware\Models\Country\Country $country */
         $country = $address->getCountry();
         $billingData['country'] = $country;
         $address->fromArray($billingData);
@@ -1512,7 +1512,7 @@ 
      */
     protected function isUserLoggedIn()
     {
-         return (isset($this->session->sUserId) && !empty($this->session->sUserId));
+            return (isset($this->session->sUserId) && !empty($this->session->sUserId));
     }
 
     /**

Spacing +10 added lines, -10 removed lines

@@ -112,13 +112,13 @@ 
         }
         
         if ($this->Request()->getPost('sCountry')) {
-            $this->session['sCountry'] = (int)$this->Request()->getPost('sCountry');
+            $this->session['sCountry'] = (int) $this->Request()->getPost('sCountry');
             $this->session["sState"] = 0;
             $this->session["sArea"] = Shopware()->Db()->fetchOne("
                 SELECT areaID FROM s_core_countries WHERE id = ?
             ", [$this->session['sCountry']]);
             unset($this->session->KlarnaOrder);
-            $this->session['sChangedCountry'] = (int)$this->Request()->getPost('sCountry');
+            $this->session['sChangedCountry'] = (int) $this->Request()->getPost('sCountry');
         }
         $this->forward('index');
     }
@@ -158,7 +158,7 @@ 
                     $this->redirect(['controller' => 'payment_klarna', 'action' => 'otherPayment']);
                     return;
                 }
-                $shopCountryId = (string)$shopCountryId;
+                $shopCountryId = (string) $shopCountryId;
                 if ($shopCountryId != $postedCountry) {
                     $this->session['sCountry'] = $postedCountry;
                     // unset klarnaOrder so it will be created with new countryID
@@ -313,10 +313,10 @@ 
 
         $this->basket['sAmountTax'] = 1.9;
         $this->View()->sShippingcosts = $debugShipping['brutto'];
-        $this->View()->sShippingcostsWithTax =  $debugShipping['brutto'];
+        $this->View()->sShippingcostsWithTax = $debugShipping['brutto'];
         $this->View()->sShippingcostsNet = $debugShipping['netto'];
         $this->View()->sShippingcostsTax = $debugShipping['tax'];
-        $this->View()->sAmount = $this->basket['AmountWithTaxNumeric'] ;
+        $this->View()->sAmount = $this->basket['AmountWithTaxNumeric'];
 
         $this->View()->sAmountNet = $this->basket['sAmountNet'];
         $this->View()->sAmountTax = $this->basket['sAmountTax'];
@@ -790,7 +790,7 @@ 
                         );
                     }
                 } catch (\Exception $ex) { /* do nothing */
-                    $this->plugin->klarnaLog("ERROR while creating User. Exception information:". $ex->getMessage(), 1);
+                    $this->plugin->klarnaLog("ERROR while creating User. Exception information:" . $ex->getMessage(), 1);
                 }
             }
         }
@@ -1036,8 +1036,8 @@ 
 
                 $update['status'] = 'created';
                 $update['merchant_reference'] = [
-                    'orderid1' => (string)$orderNumber,
-                    'orderid2' => (string)$order['reference']
+                    'orderid1' => (string) $orderNumber,
+                    'orderid2' => (string) $order['reference']
                 ];
                 $order->update($update);
             }
@@ -1366,8 +1366,8 @@ 
 
             $update['status'] = 'created';
             $update['merchant_reference'] = [
-                'orderid1' => (string)$orderNumber,
-                'orderid2' => (string)$order['reference']
+                'orderid1' => (string) $orderNumber,
+                'orderid2' => (string) $order['reference']
             ];
             $order->update($update);
         }

Braces +2 added lines, -1 removed lines

@@ -789,7 +789,8 @@
                             $session->offsetGet('sRegisterFinished')
                         );
                     }
-                } catch (\Exception $ex) { /* do nothing */
+                } catch (\Exception $ex) {
+/* do nothing */
                     $this->plugin->klarnaLog("ERROR while creating User. Exception information:". $ex->getMessage(), 1);
                 }
             }