Merge remote-tracking branch 'origin/MAGETWO-94041' into 2.2.6-develop-pr41

Author: zakdma

app/code/Magento/Sales/Model/Service/PaymentFailuresService.php

@@ -7,6 +7,7 @@
 
 use Magento\Backend\App\Area\FrontNameResolver;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Mail\Template\TransportBuilder;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Framework\Translate\Inline\StateInterface;
@@ -15,11 +16,14 @@
 use Magento\Sales\Api\PaymentFailuresInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
+use Psr\Log\LoggerInterface;
 
 /**
  * Service is responsible for handling failed payment transactions.
  *
  * It depends on Stores > Configuration > Sales > Checkout > Payment Failed Emails configuration.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class PaymentFailuresService implements PaymentFailuresInterface
 {
@@ -50,25 +54,33 @@ class PaymentFailuresService implements PaymentFailuresInterface
      */
     private $cartRepository;
 
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * @param ScopeConfigInterface $scopeConfig
      * @param StateInterface $inlineTranslation
      * @param TransportBuilder $transportBuilder
      * @param TimezoneInterface $localeDate
      * @param CartRepositoryInterface $cartRepository
+     * @param LoggerInterface|null $logger
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
         StateInterface $inlineTranslation,
         TransportBuilder $transportBuilder,
         TimezoneInterface $localeDate,
-        CartRepositoryInterface $cartRepository
+        CartRepositoryInterface $cartRepository,
+        LoggerInterface $logger = null
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->inlineTranslation = $inlineTranslation;
         $this->transportBuilder = $transportBuilder;
         $this->localeDate = $localeDate;
         $this->cartRepository = $cartRepository;
+        $this->logger = $logger ?: ObjectManager::getInstance()->get(LoggerInterface::class);
     }
 
     /**
@@ -126,7 +138,11 @@ public function handle(
                 ->addBcc($bcc)
                 ->getTransport();
 
-            $transport->sendMessage();
+            try {
+                $transport->sendMessage();
+            } catch (\Exception $e) {
+                $this->logger->critical($e->getMessage());
+            }
         }
 
         $this->inlineTranslation->resume();