autofix code style + two fixed errors setting the right exception cla…

…ss file
DevopensourceTeam · Dec 11, 2018 · 165cb2b · 165cb2b
1 parent 305271e
commit 165cb2b
Show file tree

Hide file tree

Showing 126 changed files with 570 additions and 552 deletions.
diff --git a/AdminMessage/CronMessage.php b/AdminMessage/CronMessage.php
@@ -80,7 +80,6 @@ public function isDisplayed()
         } else {
             return false;
         }
-
     }
 
     /**
@@ -93,8 +92,11 @@ public function getText()
         $message = __('You have ' . $this->_cronCheck . ' unprocessed notification(s). Please check your Cron');
         $urlMagento = "http://devdocs.magento.com/guides/v2.0/config-guide/cli/config-cli-subcommands-cron.html";
         $urlAdyen = "https://docs.adyen.com/developers/plug-ins-and-partners/magento/magento-2/configuring-the-adyen-plug-in";
-        $message .= __(' and visit <a href="%1">Magento DevDocs</a> and <a href="%2">Adyen Docs</a> on how to configure Cron.',
-            $urlMagento, $urlAdyen);
+        $message .= __(
+            ' and visit <a href="%1">Magento DevDocs</a> and <a href="%2">Adyen Docs</a> on how to configure Cron.',
+            $urlMagento,
+            $urlAdyen
+        );
         $message .= __('<i> Last  cron check was: %1</i> ', $this->_dateChecked->format('d/m/Y H:i:s'));
         return __($message);
     }
@@ -125,4 +127,3 @@ public function getSessionData($key, $remove = false)
         return $this->_authSession->getData($key, $remove);
     }
 }
-
diff --git a/AdminMessage/VersionMessage.php b/AdminMessage/VersionMessage.php
@@ -64,18 +64,17 @@ public function isDisplayed()
     {
         // Only execute the query the first time you access the Admin page
         if ($this->_authSession->isFirstPageAfterLogin()) {
-
             try {
                 $githubContent = $this->getDecodedContentFromGithub();
                 $this->setSessionData("AdyenGithubVersion", $githubContent);
                 $title = "Adyen extension version " . $githubContent['tag_name'] . " available!";
-                $versionData[] = array(
+                $versionData[] = [
                     'severity' => self::SEVERITY_NOTICE,
                     'date_added' => $githubContent['published_at'],
                     'title' => $title,
                     'description' => $githubContent['body'],
                     'url' => $githubContent['html_url'],
-                );
+                ];
 
                 /*
                  * The parse function checks if the $versionData message exists in the inbox,
@@ -95,7 +94,6 @@ public function isDisplayed()
             }
         }
         return false;
-
     }
 
     /**
@@ -150,6 +148,4 @@ public function getSessionData($key, $remove = false)
     {
         return $this->_authSession->getData($key, $remove);
     }
-
 }
-
diff --git a/Api/AdyenPaymentMethodManagementInterface.php b/Api/AdyenPaymentMethodManagementInterface.php
@@ -40,5 +40,4 @@ interface AdyenPaymentMethodManagementInterface
      * @return \Magento\Checkout\Api\Data\PaymentDetailsInterface
      */
     public function getPaymentMethods($cartId, \Magento\Quote\Api\Data\AddressInterface $shippingAddress = null);
-
 }
diff --git a/Api/AdyenRequestMerchantSessionInterface.php b/Api/AdyenRequestMerchantSessionInterface.php
@@ -24,13 +24,11 @@
 
 namespace Adyen\Payment\Api;
 
-
 interface AdyenRequestMerchantSessionInterface
 {
 
     /**
      * @return mixed
      */
     public function getMerchantSession();
-
-}
+}
diff --git a/Api/Data/InvoiceInterface.php b/Api/Data/InvoiceInterface.php
@@ -121,5 +121,4 @@ public function getInvoiceId();
      * @return $this
      */
     public function setInvoiceId($invoiceId);
-
-}
+}
diff --git a/Api/Data/NotificationInterface.php b/Api/Data/NotificationInterface.php
@@ -301,4 +301,4 @@ public function getUpdatedAt();
      * @return $this
      */
     public function setUpdatedAt($timestamp);
-}
+}
diff --git a/Api/Data/OrderPaymentInterface.php b/Api/Data/OrderPaymentInterface.php
@@ -201,5 +201,4 @@ public function getUpdatedAt();
      * @return $this
      */
     public function setUpdatedAt($timestamp);
-
-}
+}
diff --git a/Api/GuestAdyenPaymentMethodManagementInterface.php b/Api/GuestAdyenPaymentMethodManagementInterface.php
@@ -40,5 +40,4 @@ interface GuestAdyenPaymentMethodManagementInterface
      * @return \Magento\Checkout\Api\Data\PaymentDetailsInterface
      */
     public function getPaymentMethods($cartId, \Magento\Quote\Api\Data\AddressInterface $shippingAddress = null);
-
 }
diff --git a/Block/Adminhtml/System/Config/Field/Installments.php b/Block/Adminhtml/System/Config/Field/Installments.php
@@ -56,7 +56,7 @@ protected function getNumberOfInstallmentsRenderer()
 
     /**
      * Returns renderer for country element
-     * 
+     *
      * @return \Magento\Braintree\Block\Adminhtml\Form\Field\Cctypes
      */
     protected function getCcTypesRenderer()
@@ -114,7 +114,6 @@ protected function _prepareArrayRow(\Magento\Framework\DataObject $row)
 
         $options = [];
         if ($installlments) {
-
             $options['option_' . $this->getNumberOfInstallmentsRenderer()->calcOptionHash($installlments)]
                 = 'selected="selected"';
 

diff --git a/Block/Adminhtml/System/Config/Field/Version.php b/Block/Adminhtml/System/Config/Field/Version.php
@@ -58,4 +58,4 @@ protected function _getElementHtml(\Magento\Framework\Data\Form\Element\Abstract
     {
         return $this->_adyenHelper->getModuleVersion();
     }
-}
+}
diff --git a/Block/Checkout/Success.php b/Block/Checkout/Success.php
@@ -115,4 +115,4 @@ public function getOrder()
         }
         return $this->_order;
     }
-}
+}
diff --git a/Block/Form/ApplePay.php b/Block/Form/ApplePay.php
@@ -42,8 +42,7 @@ public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         \Adyen\Payment\Helper\Data $adyenHelper,
         array $data = []
-    )
-    {
+    ) {
         parent::__construct($context, $data);
         $this->_adyenHelper = $adyenHelper;
     }
@@ -60,5 +59,4 @@ public function getApplePayShippingTypes()
         }
         return $types;
     }
-
-}
+}
diff --git a/Block/Form/Boleto.php b/Block/Form/Boleto.php
@@ -64,5 +64,4 @@ public function getBoletoTypes()
         }
         return $types;
     }
-
-}
+}
diff --git a/Block/Form/Cc.php b/Block/Form/Cc.php
@@ -67,8 +67,7 @@ public function __construct(
         \Adyen\Payment\Helper\Data $adyenHelper,
         \Magento\Checkout\Model\Session $checkoutSession,
         array $data = []
-    )
-    {
+    ) {
         parent::__construct($context, $paymentConfig);
         $this->_adyenHelper = $adyenHelper;
         $this->_appState = $context->getAppState();
@@ -110,4 +109,4 @@ public function hasVerification()
         }
         return true;
     }
-}
+}
diff --git a/Block/Form/Oneclick.php b/Block/Form/Oneclick.php
@@ -72,6 +72,4 @@ public function getOneClickCards()
 
         return $cards;
     }
-
-
-}
+}
diff --git a/Block/Form/PayByMail.php b/Block/Form/PayByMail.php
@@ -30,6 +30,4 @@ class PayByMail extends \Magento\Payment\Block\Form
      * @var string
      */
     protected $_template = 'Adyen_Payment::form/pay_by_mail.phtml';
-
-
-}
+}
diff --git a/Block/Form/PosCloud.php b/Block/Form/PosCloud.php
@@ -30,5 +30,4 @@ class PosCloud extends \Magento\Payment\Block\Form
      * @var string
      */
     protected $_template = 'Adyen_Payment::form/pos_cloud.phtml';
-
 }
diff --git a/Block/Form/Sepa.php b/Block/Form/Sepa.php
@@ -59,4 +59,4 @@ public function getCountries()
     {
         return $this->_adyenHelper->getSepaCountries();
     }
-}
+}
diff --git a/Block/Info/AbstractInfo.php b/Block/Info/AbstractInfo.php
@@ -51,8 +51,7 @@ public function __construct(
         \Adyen\Payment\Model\ResourceModel\Order\Payment\CollectionFactory $adyenOrderPaymentCollectionFactory,
         Template\Context $context,
         array $data = []
-    )
-    {
+    ) {
         parent::__construct($context, $data);
         $this->_adyenHelper = $adyenHelper;
         $this->_adyenOrderPaymentCollectionFactory = $adyenOrderPaymentCollectionFactory;
@@ -76,4 +75,4 @@ public function isDemoMode()
         $storeId = $this->getInfo()->getOrder()->getStoreId();
         return $this->_adyenHelper->getAdyenAbstractConfigDataFlag('demo_mode', $storeId);
     }
-}
+}
diff --git a/Block/Info/ApplePay.php b/Block/Info/ApplePay.php
@@ -26,4 +26,4 @@
 
 class ApplePay extends Cc
 {
-}
+}
diff --git a/Block/Info/Boleto.php b/Block/Info/Boleto.php
@@ -29,5 +29,4 @@ class Boleto extends AbstractInfo
      * @var string
      */
     protected $_template = 'Adyen_Payment::info/adyen_boleto.phtml';
-
 }
diff --git a/Block/Info/PayByMail.php b/Block/Info/PayByMail.php
@@ -29,5 +29,4 @@ class PayByMail extends AbstractInfo
      * @var string
      */
     protected $_template = 'Adyen_Payment::info/adyen_pay_by_mail.phtml';
-
 }
diff --git a/Block/Info/Pos.php b/Block/Info/Pos.php
@@ -29,5 +29,4 @@ class Pos extends AbstractInfo
      * @var string
      */
     protected $_template = 'Adyen_Payment::info/adyen_pos.phtml';
-
 }
diff --git a/Block/Info/PosCloud.php b/Block/Info/PosCloud.php
@@ -30,5 +30,4 @@ class PosCloud extends AbstractInfo
      * @var string
      */
     protected $_template = 'Adyen_Payment::info/adyen_pos_cloud.phtml';
-
 }
diff --git a/Block/Info/Sepa.php b/Block/Info/Sepa.php
@@ -29,5 +29,4 @@ class Sepa extends AbstractInfo
      * @var string
      */
     protected $_template = 'Adyen_Payment::info/adyen_sepa.phtml';
-
 }
diff --git a/Block/Redirect/Pos.php b/Block/Redirect/Pos.php
@@ -105,18 +105,19 @@ public function getLaunchLink()
     {
         $launchlink = "";
         try {
-            if ($this->_order->getPayment())
-            {
-
+            if ($this->_order->getPayment()) {
                 $realOrderId            = $this->_order->getRealOrderId();
                 $orderCurrencyCode      = $this->_order->getOrderCurrencyCode();
                 $amount                 = $this->_adyenHelper->formatAmount(
-                    $this->_order->getGrandTotal(), $orderCurrencyCode
+                    $this->_order->getGrandTotal(),
+                    $orderCurrencyCode
                 );
                 $shopperEmail           = $this->_order->getCustomerEmail();
                 $customerId             = $this->_order->getCustomerId();
-                $callbackUrl            = $this->_urlBuilder->getUrl('adyen/process/resultpos',
-                    ['_secure' => $this->_getRequest()->isSecure()]);
+                $callbackUrl            = $this->_urlBuilder->getUrl(
+                    'adyen/process/resultpos',
+                    ['_secure' => $this->_getRequest()->isSecure()]
+                );
                 $addReceiptOrderLines   = $this->_adyenHelper->getAdyenPosConfigData("add_receipt_order_lines");
                 $recurringContract      = $this->_adyenHelper->getAdyenPosConfigData('recurring_type');
                 $currencyCode           = $orderCurrencyCode;
@@ -153,7 +154,7 @@ public function getLaunchLink()
 
                 $this->_adyenLogger->addAdyenDebug(print_r($launchlink, true));
             }
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             // do nothing for now
             throw($e);
         }
@@ -232,7 +233,6 @@ protected function _getReceiptOrderLines(\Magento\Sales\Model\Order $order)
             );
             $myReceiptOrderLines .= "  " . 1 . " " . $order->getShippingDescription() . "| " .
                 $currency . " " . $shippingAmountFormat ."|\n";
-
         }
 
         if ($order->getPaymentFeeAmount() > 0) {
@@ -243,7 +243,6 @@ protected function _getReceiptOrderLines(\Magento\Sales\Model\Order $order)
             );
             $myReceiptOrderLines .= "  " . 1 . " " . $this->__('Payment Fee') . "| " .
                 $currency . " " . $paymentFeeAmount ."|\n";
-
         }
 
         $myReceiptOrderLines .=    "|--------|\n".
@@ -282,4 +281,4 @@ protected function _getRequest()
     {
         return $this->_request;
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,5 +40,4 @@ interface AdyenPaymentMethodManagementInterface @@
          * @return \Magento\Checkout\Api\Data\PaymentDetailsInterface
          */
         public function getPaymentMethods($cartId, \Magento\Quote\Api\Data\AddressInterface $shippingAddress = null);
     }