From 9d69474372c0598c4e2e177c983276b86081a97b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89bano=20Penha=20Andrello=20Lopes?=
 <ebano.lopes@osf-commerce.com>
Date: Mon, 8 Apr 2019 23:32:12 -0300
Subject: [PATCH] 3.3.0: Minor fixes

---
 Model/Payment/DataMapper.php         | 4 ++--
 Plugin/Magento/Sales/Model/Order.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Model/Payment/DataMapper.php b/Model/Payment/DataMapper.php
index d72bce25..0538ee67 100644
--- a/Model/Payment/DataMapper.php
+++ b/Model/Payment/DataMapper.php
@@ -87,7 +87,7 @@ public function checkMethod(\Magento\Sales\Api\Data\OrderPaymentInterface $order
      * @param \Magento\Sales\Model\Order $order
      * @return string
      */
-    public final function getCode(\Magento\Sales\Model\Order $order)
+    final public function getCode(\Magento\Sales\Model\Order $order)
     {
         if ($this->getDataCalled) {
             return null;
@@ -103,7 +103,7 @@ public final function getCode(\Magento\Sales\Model\Order $order)
      * @param \Magento\Sales\Model\Order $order
      * @return string
      */
-    public final function getData(\Magento\Sales\Model\Order $order)
+    final public function getData(\Magento\Sales\Model\Order $order)
     {
         $this->checkMethod($order->getPayment());
         return $this->getPaymentData($order);
diff --git a/Plugin/Magento/Sales/Model/Order.php b/Plugin/Magento/Sales/Model/Order.php
index 7e08036b..0279b1c9 100644
--- a/Plugin/Magento/Sales/Model/Order.php
+++ b/Plugin/Magento/Sales/Model/Order.php
@@ -104,7 +104,7 @@ public function beforeSetState(\Magento\Sales\Model\Order $subject, $state)
                 $debugBacktraceLog = implode("\n", $debugBacktraceLog);
                 $this->logger->debug("Backtrace: \n{$debugBacktraceLog}\n\n");
             }
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $this->logger('Exception logging order state change: ' . $e->getMessage());
         }