Merge pull request #29 from signifyd/stage

3.5.0
signifyd · Nov 20, 2019 · c851dc7 · c851dc7
2 parents 2a0d385 + 5543f0a
commit c851dc7
Show file tree

Hide file tree

Showing 94 changed files with 768 additions and 352 deletions.
diff --git a/Api/Core/SignifydAPIFactory.php b/Api/Core/SignifydAPIFactory.php
@@ -9,8 +9,7 @@
  * After remove this class it is necessary to replace all its occurrences with \Signifyd\Core\SignifydAPIFactory
  *
  * Class SignifydAPIFactory
- * @package Signifyd\Connect\Api\Core
  */
 class SignifydAPIFactory extends \Signifyd\Core\SignifydAPIFactory
 {
-}
+}
diff --git a/Block/Adminhtml/CaseInfo.php b/Block/Adminhtml/CaseInfo.php
@@ -86,4 +86,4 @@ public function getCaseScore()
     {
         return floor($this->getCaseEntity()->getData('score'));
     }
-}
+}
diff --git a/Block/Adminhtml/Order/View.php b/Block/Adminhtml/Order/View.php
@@ -45,8 +45,8 @@ public function getCase(\Magento\Sales\Model\Order $order)
         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
 
         /** @var $case \Signifyd\Connect\Model\Casedata */
-        $case = $objectManager->get('Signifyd\Connect\Model\Casedata');
+        $case = $objectManager->get(\Signifyd\Connect\Model\Casedata::class);
         $case->load($order->getIncrementId());
         return $case;
     }
-}
+}
diff --git a/Block/Adminhtml/System/Config/Field/Version.php b/Block/Adminhtml/System/Config/Field/Version.php
@@ -30,4 +30,4 @@ protected function _getElementHtml(AbstractElement $element)
     {
         return $this->moduleResource->getDbVersion('Signifyd_Connect');
     }
-}
+}
diff --git a/Block/Device.php b/Block/Device.php
@@ -35,4 +35,4 @@ public function isEnabled()
             return false;
         }
     }
-}
+}
diff --git a/Controller/Adminhtml/Order/Unhold.php b/Controller/Adminhtml/Order/Unhold.php
@@ -62,7 +62,7 @@ public function execute()
         }
 
         /** @var $case \Signifyd\Connect\Model\Casedata */
-        $case = $this->_objectManager->get('Signifyd\Connect\Model\Casedata');
+        $case = $this->_objectManager->get(\Signifyd\Connect\Model\Casedata::class);
         $case->load($order->getIncrementId());
 
         if (!$case->isHoldReleased()) {
@@ -72,7 +72,8 @@ public function execute()
 
         $resultRedirect = parent::execute();
 
-        $order->addStatusHistoryComment("Signifyd: order status updated by {$this->authSession->getUser()->getUserName()}");
+        $message = "Signifyd: order status updated by {$this->authSession->getUser()->getUserName()}";
+        $order->addStatusHistoryComment($message);
         $order->save();
 
         return $resultRedirect;

diff --git a/Controller/Router.php b/Controller/Router.php
@@ -39,28 +39,19 @@ public function match(\Magento\Framework\App\RequestInterface $request)
         if ($request->getModuleName() === 'signifyd_connect') {
             return;
         }
-        /*
-         * We will search “examplerouter” and “exampletocms” words and make forward depend on word
-         * -examplerouter will forward to base router to match Signifydtest front name, test controller path and test controller class
-         * -exampletocms will set front name to cms, controller path to page and action to view
-         */
+
         $identifier = trim($request->getPathInfo(), '/');
 
-        if(strpos($identifier, 'signifyd/webhooks') !== false && strpos($identifier, 'signifyd/webhooks/handler') === false) {
-            /*
-             * We must set module, controller path and action name for our controller class(Controller/Test/Test.php)
-             */
+        if (strpos($identifier, 'signifyd/webhooks') !== false &&
+            strpos($identifier, 'signifyd/webhooks/handler') === false
+        ) {
             $request->setModuleName('signifyd_connect')->setControllerName('webhooks')->setActionName('index');
         } else {
-            //There is no match
             return;
         }
 
-        /*
-         * We have match and now we will forward action
-         */
         return $this->actionFactory->create(
-            'Magento\Framework\App\Action\Forward',
+            \Magento\Framework\App\Action\Forward::class,
             ['request' => $request]
         );
     }

diff --git a/Controller/Webhooks/Index.php b/Controller/Webhooks/Index.php
@@ -62,7 +62,7 @@ public function __construct(
         // Compatibility with Magento 2.3+ which required form_key on every request
         // Magento expects class to implement \Magento\Framework\App\CsrfAwareActionInterface but this causes
         // a backward incompatibility to Magento versions below 2.3
-        if (interface_exists("\Magento\Framework\App\CsrfAwareActionInterface")) {
+        if (interface_exists(\Magento\Framework\App\CsrfAwareActionInterface::class)) {
             $request = $this->getRequest();
             if ($request instanceof RequestInterface && $request->isPost() && empty($request->getParam('form_key'))) {
                 $request->setParam('form_key', $formKey->getFormKey());
@@ -121,13 +121,13 @@ public function processRequest($request, $hash, $topic)
             /** @var $order \Magento\Sales\Model\Order */
             $order = $this->orderFactory->create()->loadByIncrementId($requestJson->orderId);
             /** @var $case \Signifyd\Connect\Model\Casedata */
-            $case = $this->objectManager->create('Signifyd\Connect\Model\Casedata')->load($requestJson->orderId);
+            $case = $this->objectManager->create(\Signifyd\Connect\Model\Casedata::class)->load($requestJson->orderId);
 
-            $caseData = array(
+            $caseData = [
                 "case" => $case,
                 "order" => $order,
                 "response" => $requestJson
-            );
+            ];
 
             if ($case->isEmpty()) {
                 $message = "Case {$requestJson->orderId} on request not found on Magento";
@@ -156,7 +156,7 @@ public function processRequest($request, $hash, $topic)
 
         if ($signifydApi->validWebhookRequest($request, $hash, $topic)) {
             /** @var \Signifyd\Connect\Model\Casedata $caseObj */
-            $caseObj = $this->objectManager->create('Signifyd\Connect\Model\Casedata');
+            $caseObj = $this->objectManager->create(\Signifyd\Connect\Model\Casedata::class);
             $caseObj->updateCase($caseData);
             $this->getResponse()->setStatusCode(Http::STATUS_CODE_200);
             return;

diff --git a/Cron/RetryCaseJob.php b/Cron/RetryCaseJob.php
@@ -61,7 +61,8 @@ public function execute()
         $waitingCases = $this->caseRetryObj->getRetryCasesByStatus(Casedata::WAITING_SUBMISSION_STATUS);
 
         foreach ($waitingCases as $case) {
-            $this->logger->debug("Signifyd: preparing for send case no: {$case['order_increment']}", array('entity' => $case));
+            $message = "Signifyd: preparing for send case no: {$case['order_increment']}";
+            $this->logger->debug($message, ['entity' => $case]);
 
             $order = $this->getOrder($case['order_increment']);
 
@@ -70,7 +71,7 @@ public function execute()
 
             if ($result) {
                 /** @var \Signifyd\Connect\Model\Casedata $caseObj */
-                $caseObj = $this->_objectManager->create('Signifyd\Connect\Model\Casedata')
+                $caseObj = $this->_objectManager->create(\Signifyd\Connect\Model\Casedata::class)
                     ->load($case->getOrderIncrement())
                     ->setCode($result)
                     ->setMagentoStatus(Casedata::IN_REVIEW_STATUS)
@@ -85,7 +86,8 @@ public function execute()
         $inReviewCases = $this->caseRetryObj->getRetryCasesByStatus(Casedata::IN_REVIEW_STATUS);
 
         foreach ($inReviewCases as $case) {
-            $this->logger->debug("Signifyd: preparing for review case no: {$case['order_increment']}", array('entity' => $case));
+            $message = "Signifyd: preparing for review case no: {$case['order_increment']}";
+            $this->logger->debug($message, ['entity' => $case]);
 
             $this->caseRetryObj->processInReviewCase($case, $this->getOrder($case['order_increment']));
         }
@@ -96,7 +98,8 @@ public function execute()
         $inProcessingCases = $this->caseRetryObj->getRetryCasesByStatus(Casedata::PROCESSING_RESPONSE_STATUS);
 
         foreach ($inProcessingCases as $case) {
-            $this->logger->debug("Signifyd: preparing for process case no: {$case['order_increment']}", array('entity' => $case));
+            $message = "Signifyd: preparing for process case no: {$case['order_increment']}";
+            $this->logger->debug($message, ['entity' => $case]);
 
             $this->caseRetryObj->processResponseStatus($case, $this->getOrder($case['order_increment']));
         }
@@ -108,6 +111,6 @@ public function execute()
 
     public function getOrder($incrementId)
     {
-        return $this->_objectManager->get('Magento\Sales\Model\Order')->loadByIncrementId($incrementId);
+        return $this->_objectManager->get(\Magento\Sales\Model\Order::class)->loadByIncrementId($incrementId);
     }
 }
diff --git a/CustomerData/Fingerprint.php b/CustomerData/Fingerprint.php
@@ -7,10 +7,6 @@
 use Magento\Checkout\Model\Session;
 use Signifyd\Connect\Helper\DeviceHelper;
 
-/**
- * Class FingerprintSection
- * @package Signifyd\Connect\CustomerData
- */
 class Fingerprint extends DataObject implements SectionSourceInterface
 {
     /**
@@ -75,4 +71,4 @@ public function getSectionData()
 
         return $data;
     }
-}
+}
diff --git a/Helper/ConfigHelper.php b/Helper/ConfigHelper.php
@@ -58,8 +58,7 @@ public function __construct(
         \Signifyd\Connect\Helper\SignifydSettingsMagentoFactory $signifydSettingsMagentoFactory,
         \Signifyd\Connect\Api\Core\SignifydAPIFactory $signifydAPIFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager
-    )
-    {
+    ) {
         $this->scopeConfigInterface = $scopeConfigInterface;
         $this->signifydSettingsMagentoFactory = $signifydSettingsMagentoFactory;
         $this->signifydAPIFactory = $signifydAPIFactory;
@@ -151,7 +150,8 @@ public function getSignifydApi(\Magento\Framework\Model\AbstractModel $entity =
         if (isset($this->signifydAPI[$storeCode]) === false ||
             $this->signifydAPI[$storeCode] instanceof \Signifyd\Core\SignifydAPI == false) {
             $signifydSettingsMagento = $this->getSignifydSettingsMagento($entity);
-            $this->signifydAPI[$storeCode] = $this->signifydAPIFactory->create(array('settings' => $signifydSettingsMagento));
+            $data = ['settings' => $signifydSettingsMagento];
+            $this->signifydAPI[$storeCode] = $this->signifydAPIFactory->create($data);
         }
 
         return $this->signifydAPI[$storeCode];
@@ -171,4 +171,4 @@ public function isEnabled(\Magento\Framework\Model\AbstractModel $entity = null)
 
         return $this->getConfigData('signifyd/general/enabled', $entity, true);
     }
-}
+}
diff --git a/Helper/DeviceHelper.php b/Helper/DeviceHelper.php
@@ -52,4 +52,4 @@ public function generateFingerprint($quoteId)
         $baseUrl = $this->storeManager->getStore()->getBaseUrl();
         return 'M2' . base64_encode($baseUrl) . $quoteId;
     }
-}
+}
diff --git a/Helper/FulfillmentHelper.php b/Helper/FulfillmentHelper.php
@@ -215,7 +215,7 @@ public function generateFulfillmentData(\Magento\Sales\Model\Order\Shipment $shi
         }
 
         /** @var \Signifyd\Models\Fulfillment $fulfillment */
-        $fulfillment = SignifydModel::Make("\\Signifyd\\Models\\Fulfillment");
+        $fulfillment = SignifydModel::Make(\Signifyd\Models\Fulfillment::class);
         $fulfillment->id = $shipment->getIncrementId();
         $fulfillment->orderId = $shipment->getOrder()->getIncrementId();
         $fulfillment->createdAt = $this->getCreatedAt($shipment);
@@ -240,7 +240,7 @@ public function generateFulfillmentData(\Magento\Sales\Model\Order\Shipment $shi
      */
     public function getTrackingNumbers(\Magento\Sales\Model\Order\Shipment $shipment)
     {
-        $trackingNumbers = array();
+        $trackingNumbers = [];
 
         $trackingCollection = $shipment->getTracksCollection();
         /**
@@ -317,7 +317,7 @@ public function getFulfillmentStatus(\Magento\Sales\Model\Order\Shipment $shipme
      */
     public function getTrackingUrls(\Magento\Sales\Model\Order\Shipment $shipment)
     {
-        return array();
+        return [];
     }
 
     /**
@@ -326,7 +326,7 @@ public function getTrackingUrls(\Magento\Sales\Model\Order\Shipment $shipment)
      */
     public function getProducts(\Magento\Sales\Model\Order\Shipment $shipment)
     {
-        $products = array();
+        $products = [];
 
         /** @var \Magento\Sales\Model\Order\Shipment\Item $item */
         foreach ($shipment->getAllItems() as $item) {
@@ -338,7 +338,7 @@ public function getProducts(\Magento\Sales\Model\Order\Shipment $shipment)
              */
 
             /** @var \Signifyd\Models\Product $product */
-            $product = SignifydModel::Make("\\Signifyd\\Models\\Product");
+            $product = SignifydModel::Make(\Signifyd\Models\Product::class);
             $product->itemId = $item->getSku();
             $product->itemName = $item->getName();
             $product->itemIsDigital = (bool) $item->getOrderItem()->getIsVirtual();
@@ -394,14 +394,14 @@ public function getItemImage(\Magento\Sales\Model\Order\Shipment\Item $item)
      */
     public function getShipmentStatus(\Magento\Sales\Model\Order\Shipment $shipment)
     {
-        $validShipmentStatus = array(
+        $validShipmentStatus = [
             'in transit',
             'out for delivery',
             'waiting for pickup',
             'failed attempt',
             'delivered',
             'exception'
-        );
+        ];
 
         return null;
     }
@@ -413,7 +413,7 @@ public function getShipmentStatus(\Magento\Sales\Model\Order\Shipment $shipment)
     public function getDeliveryAddress(\Magento\Sales\Model\Order\Shipment $shipment)
     {
         /** @var \Signifyd\Models\Address $deliveryAddress */
-        $deliveryAddress = SignifydModel::Make("\\Signifyd\\Models\\Address");
+        $deliveryAddress = SignifydModel::Make(\Signifyd\Models\Address::class);
         $deliveryAddress->streetAddress = $this->getStreetAddress($shipment);
         $deliveryAddress->unit = null;
         $deliveryAddress->city = $shipment->getShippingAddress()->getCity();
@@ -433,4 +433,4 @@ public function getStreetAddress(\Magento\Sales\Model\Order\Shipment $shipment)
         $street = $shipment->getShippingAddress()->getStreet();
         return implode(', ', $street);
     }
-}
+}