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

Doc Comments +6 added lines, -6 removed lines

@@ -532,7 +532,7 @@ 
      *
      * @param array $orderDataRaw
      * @param string $type
-     * @return bool|KlarnaAddr
+     * @return KlarnaAddr
      */
     protected function getKlarnaAddrByRawOrderData($orderDataRaw, $type)
     {
@@ -1710,7 +1710,7 @@ 
     /**
      * Creates and returns the klarna client for an event.
      *
-     * @return \Klarna_Checkout_Connector
+     * @return Klarna_Checkout_ConnectorInterface
      */
     public function onInitResourceKlarnaCheckoutConnector()
     {
@@ -1760,7 +1760,7 @@ 
 
     /**
      * @param string $requiredVersion
-     * @return bool|mixed
+     * @return boolean
      */
     protected function assertMinimumVersion($requiredVersion)
     {
@@ -1867,7 +1867,7 @@ 
      * Helper method to get the config whether or not to show the login-panel in the klarna-checkout.
      *
      * @param Enlight_Config $config
-     * @param $userLoggedIn
+     * @param boolean $userLoggedIn
      * @return bool
      */
     private function getShowLoginConfig($config, $userLoggedIn)
@@ -1927,7 +1927,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)
     {
@@ -2232,7 +2232,7 @@ 
     /**
      * @param Shopware\Models\Payment\Payment $payment
      * @param $basket
-     * @return bool
+     * @return double
      */
     private function getFee($payment, $basket)
     {

Indentation +4 added lines, -4 removed lines

@@ -1359,12 +1359,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);
     }
     
 
@@ -1455,7 +1455,7 @@ 
             $userData['billingaddress']['country'] =$country;   
             $userData['shippingaddress']['countryID'] = $session['sChangedCountry'];
             $userData['billingaddress']['countryID'] = $session['sChangedCountry'];
-         }
+            }
         
         $orderVariables['sUserData'] = $userData;
         $testbreakpoint = 0;

Spacing +31 added lines, -31 removed lines

@@ -506,10 +506,10 @@ 
         $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);
@@ -518,9 +518,9 @@ 
             if ($mPrintableElement !== null) {
                 $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';
+            $logfilePath = $shopPath . '/var/log/klarnaTrace.log';
             $fileHandler = fopen($logfilePath, 'a');
             fwrite($fileHandler, $fullMessage);
             fclose($fileHandler);
@@ -549,7 +549,7 @@ 
             $country = $repository->findOneBy(['id' => $baseData['countryId']]);
             $countryiso = $country->getIso();
 
-            $klarnaAddr =  new KlarnaAddr();
+            $klarnaAddr = new KlarnaAddr();
             $klarnaAddr->setEmail($orderDataRaw['customerEmail']);
             $klarnaAddr->setFirstName($baseData['firstName']);
             $klarnaAddr->setLastName($baseData['lastName']);
@@ -597,7 +597,7 @@ 
                 }
                 $streetnr .= (string) $addressPart;
             } else {
-                $street .= (string)' '.$addressPart;
+                $street .= (string) ' ' . $addressPart;
             }
         }
 
@@ -606,7 +606,7 @@ 
             $streetnr_extension .= $baseData['additionalAddressLine1'];
         }
         if (!empty($baseData['additionalAddressLine2'])) {
-            $streetnr_extension .= "\n".$baseData['additionalAddressLine2'];
+            $streetnr_extension .= "\n" . $baseData['additionalAddressLine2'];
         }
 
         $return = [
@@ -1284,7 +1284,7 @@ 
 
         // just return in case kco payment is deactivated in backend
 
-        if (!$this->isKcoPaymentActive()){
+        if (!$this->isKcoPaymentActive()) {
             return;
         }
         $user = $view->getAssign('sUserData');
@@ -1295,7 +1295,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());
@@ -1324,7 +1324,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()) {
@@ -1444,15 +1444,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(['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'];
          }
@@ -1472,10 +1472,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, [$locale]);
-        $countryId = ($countryId) ? (int)$countryId : null;
+        $countryId = ($countryId) ? (int) $countryId : null;
                 
         return $countryId;
     }
@@ -1506,7 +1506,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';
@@ -1521,10 +1521,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'];
@@ -1539,19 +1539,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[] = [
                 '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'])) {
@@ -1562,8 +1562,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),
             ];
         }
 
@@ -1649,7 +1649,7 @@ 
         }
 
         // Make sure phone number is unset if empty
-        if ($address['phone'] === null){
+        if ($address['phone'] === null) {
             unset($address['phone']);
         }
         return $address;
@@ -1838,9 +1838,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()

Braces +5 added lines, -6 removed lines

@@ -1284,7 +1284,7 @@ 
 
         // just return in case kco payment is deactivated in backend
 
-        if (!$this->isKcoPaymentActive()){
+        if (!$this->isKcoPaymentActive()) {
             return;
         }
         $user = $view->getAssign('sUserData');
@@ -1324,7 +1324,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()) {
@@ -1444,7 +1444,7 @@ 
             $userData['additional']
         );
         
-        if (isset($session['sChangedCountry'])){
+        if (isset($session['sChangedCountry'])) {
             
             /** @var \Shopware\Components\Model\ModelManager $em */
             $em = $this->get('models');
@@ -1540,8 +1540,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);
@@ -1649,7 +1648,7 @@ 
         }
 
         // Make sure phone number is unset if empty
-        if ($address['phone'] === null){
+        if ($address['phone'] === null) {
             unset($address['phone']);
         }
         return $address;

Controllers/Frontend/PaymentKlarna.php

Doc Comments +1 added lines

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

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);
                 }
             }

Indentation +14 added lines, -14 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();
         }
@@ -289,7 +289,7 @@ 
 
         // Klarna Prefill checkBox
         if ($this->isUserLoggedIn()) {
-               $this->View()->assign('KlarnaPreFillSelect', !$this->session['klarnaPreFill']);
+                $this->View()->assign('KlarnaPreFillSelect', !$this->session['klarnaPreFill']);
         }
 
         // Iframe Backend Config
@@ -703,8 +703,8 @@ 
                     }
                     $module->sSYSTEM->_POST = $data['billing'];
                     if ($this->plugin->isShopwareVersionNew()) {
-                         $userId = $session->offsetGet('sUserId');
-                         $this->updateBilling($userId, $data['billing']);
+                            $userId = $session->offsetGet('sUserId');
+                            $this->updateBilling($userId, $data['billing']);
                     } else {
                         $module->sUpdateBilling();
                     }
@@ -822,7 +822,7 @@ 
             $plainbilling['birthday'] = null;
         } else {
             $plainbilling['birthday'] = new \DateTime(
-               $plainbilling['birthyear'] . '-' .
+                $plainbilling['birthyear'] . '-' .
                     $plainbilling['birthmonth'] . '-' .
                     $plainbilling['birthday']);
         }
@@ -893,12 +893,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 */
@@ -911,7 +911,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) {
@@ -947,7 +947,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);
@@ -1522,7 +1522,7 @@ 
      */
     protected function isUserLoggedIn()
     {
-         return (isset($this->session->sUserId) && !empty($this->session->sUserId));
+            return (isset($this->session->sUserId) && !empty($this->session->sUserId));
     }
 
     /**

Components/Klarna/checkout/threatmetrix.class.php

Spacing +14 added lines, -14 removed lines

@@ -116,20 +116,20 @@
     public function toHTML()
     {
         $html
-            = "<p style='display: none; ".
-            "background:url($this->proto://$this->host/fp/clear.png?org_id=".
-            "$this->orgID&session_id=$this->sessionID&m=1)'></p>".
-            "<script src='$this->proto://$this->host/fp/check.js?org_id=".
-            "$this->orgID&session_id=$this->sessionID' ".
-            "type='text/javascript'></script>".
-            "<img src='$this->proto://$this->host/fp/clear.png?org_id=".
-            "$this->orgID&session_id=$this->sessionID&m=2' alt='' >".
-            "<object type='application/x-shockwave-flash' style='display: none' ".
-            "data='$this->proto://$this->host/fp/fp.swf?org_id=$this->orgID&".
-            "session_id=$this->sessionID' width='1' height='1' id='obj_id'>".
-            "<param name='movie' value='$this->proto://$this->host/fp/fp.swf?".
-            "org_id=$this->orgID&session_id=$this->sessionID' />".
-            "<div></div>".
+            = "<p style='display: none; " .
+            "background:url($this->proto://$this->host/fp/clear.png?org_id=" .
+            "$this->orgID&session_id=$this->sessionID&m=1)'></p>" .
+            "<script src='$this->proto://$this->host/fp/check.js?org_id=" .
+            "$this->orgID&session_id=$this->sessionID' " .
+            "type='text/javascript'></script>" .
+            "<img src='$this->proto://$this->host/fp/clear.png?org_id=" .
+            "$this->orgID&session_id=$this->sessionID&m=2' alt='' >" .
+            "<object type='application/x-shockwave-flash' style='display: none' " .
+            "data='$this->proto://$this->host/fp/fp.swf?org_id=$this->orgID&" .
+            "session_id=$this->sessionID' width='1' height='1' id='obj_id'>" .
+            "<param name='movie' value='$this->proto://$this->host/fp/fp.swf?" .
+            "org_id=$this->orgID&session_id=$this->sessionID' />" .
+            "<div></div>" .
             "</object>";
         return $html;
     }

Components/Klarna/pclasses/xmlstorage.class.php

Spacing +1 added lines, -1 removed lines

@@ -226,7 +226,7 @@
         $xpath = new DOMXpath($this->dom);
 
         foreach ($this->pclasses as $eid => $pclasses) {
-            $estore = $xpath->query('/klarna/estore[@id="'.$eid.'"]');
+            $estore = $xpath->query('/klarna/estore[@id="' . $eid . '"]');
 
             if ($estore === false || $estore->length === 0) {
                 //No estore with matching eid, create it.

Components/Klarna/pclasses/mysqlstorage.class.php

Spacing +6 added lines, -6 removed lines

@@ -120,7 +120,7 @@ 
         $this->link = mysql_connect($this->addr, $this->user, $this->passwd);
         if ($this->link === false) {
             throw new Klarna_DatabaseException(
-                'Failed to connect to database! ('.mysql_error().')'
+                'Failed to connect to database! (' . mysql_error() . ')'
             );
         }
     }
@@ -140,7 +140,7 @@ 
         )
         ) {
             throw new Klarna_DatabaseException(
-                'Failed to create! ('.mysql_error().')'
+                'Failed to create! (' . mysql_error() . ')'
             );
         }
 
@@ -163,7 +163,7 @@ 
 
         if (!$create) {
             throw new Klarna_DatabaseException(
-                'Table not existing, failed to create! ('.mysql_error().')'
+                'Table not existing, failed to create! (' . mysql_error() . ')'
             );
         }
     }
@@ -247,7 +247,7 @@ 
         );
         if ($result === false) {
             throw new Klarna_DatabaseException(
-                'SELECT query failed! ('.mysql_error().')'
+                'SELECT query failed! (' . mysql_error() . ')'
             );
         }
         while ($row = mysql_fetch_assoc($result)) {
@@ -311,7 +311,7 @@ 
                 );
                 if ($result === false) {
                     throw new Klarna_DatabaseException(
-                        'INSERT INTO query failed! ('.mysql_error().')'
+                        'INSERT INTO query failed! (' . mysql_error() . ')'
                     );
                 }
             }
@@ -337,7 +337,7 @@ 
                 "DELETE FROM `{$this->dbName}`.`{$this->dbTable}`",
                 $this->link
             );
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             throw new Klarna_DatabaseException(
                 $e->getMessage(), $e->getCode()
             );

Components/CSRFWhitelistAware.php

Braces +3 added lines, -1 removed lines

@@ -3,6 +3,8 @@
 namespace Shopware\Components;
 
 if (!interface_exists('\Shopware\Components\CSRFWhitelistAware')) {
-    interface CSRFWhitelistAware {}
+    interface CSRFWhitelistAware
+    {
+}
 }
 

Controllers/Backend/PaymentKlarna.php

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();

Doc Comments +5 added lines, -1 removed lines

@@ -43,6 +43,7 @@ 
 
     /**
      * {@inheritdoc}
+     * @param string $name
      */
     public function get($name)
     {
@@ -117,6 +118,9 @@ 
         return $shop;
     }
 
+    /**
+     * @param string $statusType
+     */
     private function getOrderPaymentStatus($statusType)
     {
         $paymentStatus = $this->plugin->Config()->get($statusType);
@@ -633,7 +637,7 @@ 
 
 
     /**
-     * @return array
+     * @return string[]
      */
     public function getWhitelistedCSRFActions()
     {