Merge remote-tracking branch 'origin/MAGETWO-95745' into BugFixPR

Author: Joan He

app/code/Magento/Checkout/Controller/Onepage/Success.php

@@ -1,13 +1,15 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Checkout\Controller\Onepage;
 
 use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 
+/**
+ * Onepage checkout success controller class
+ */
 class Success extends \Magento\Checkout\Controller\Onepage implements HttpGetActionInterface
 {
     /**
@@ -26,7 +28,10 @@ public function execute()
         $resultPage = $this->resultPageFactory->create();
         $this->_eventManager->dispatch(
             'checkout_onepage_controller_success_action',
-            ['order_ids' => [$session->getLastOrderId()]]
+            [
+                'order_ids' => [$session->getLastOrderId()],
+                'order' => $session->getLastRealOrder()
+            ]
         );
         return $resultPage;
     }

app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php

@@ -1,19 +1,22 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Paypal\Controller\Payflow;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\CsrfAwareActionInterface;
 use Magento\Framework\App\Request\InvalidRequestException;
 use Magento\Framework\App\RequestInterface;
 use Magento\Paypal\Controller\Payflow;
 use Magento\Paypal\Model\Config;
 use Magento\Sales\Model\Order;
 
-class ReturnUrl extends Payflow implements CsrfAwareActionInterface
+/**
+ * Paypal Payflow ReturnUrl controller class
+ */
+class ReturnUrl extends Payflow implements CsrfAwareActionInterface, HttpGetActionInterface
 {
     /**
      * @var array of allowed order states on frontend
@@ -68,7 +71,6 @@ public function execute()
             if ($order->getIncrementId()) {
                 if ($this->checkOrderState($order)) {
                     $redirectBlock->setData('goto_success_page', true);
-                    $this->_eventManager->dispatch('paypal_checkout_success', ['order' => $order]);
                 } else {
                     if ($this->checkPaymentMethod($order)) {
                         $gotoSection = $this->_cancelPayment((string)$this->getRequest()->getParam('RESPMSG'));

app/code/Magento/Paypal/Test/Unit/Controller/Payflow/ReturnUrlTest.php

@@ -5,7 +5,6 @@
  */
 namespace Magento\Paypal\Test\Unit\Controller\Payflow;
 
-use Magento\Framework\Event\ManagerInterface;
 use Magento\Sales\Api\PaymentFailuresInterface;
 use Magento\Checkout\Block\Onepage\Success;
 use Magento\Checkout\Model\Session;
@@ -97,11 +96,6 @@ class ReturnUrlTest extends \PHPUnit\Framework\TestCase
      */
     private $paymentFailures;
 
-    /**
-     * @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $eventManagerMock;
-
     /**
      * @inheritdoc
      */
@@ -158,16 +152,10 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->eventManagerMock = $this->getMockBuilder(ManagerInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
         $this->context->method('getView')
             ->willReturn($this->view);
         $this->context->method('getRequest')
             ->willReturn($this->request);
-        $this->context->method('getEventManager')
-            ->willReturn($this->eventManagerMock);
 
         $this->returnUrl = $this->objectManager->getObject(
             ReturnUrl::class,
@@ -199,10 +187,6 @@ public function testExecuteAllowedOrderState($state)
             ->with('goto_success_page', true)
             ->willReturnSelf();
 
-        $this->eventManagerMock->expects($this->once())
-            ->method('dispatch')
-            ->with('paypal_checkout_success', $this->arrayHasKey('order'));
-
         $result = $this->returnUrl->execute();
         $this->assertNull($result);
     }

app/code/Magento/Signifyd/etc/events.xml

@@ -9,10 +9,10 @@
     <event name="checkout_submit_all_after">
         <observer name="signifyd_place_order_observer" instance="Magento\Signifyd\Observer\PlaceOrder" />
     </event>
-    <event name="paypal_express_place_order_success">
-        <observer name="signifyd_place_order_paypal_express_observer" instance="Magento\Signifyd\Observer\PlaceOrder"/>
-    </event>
     <event name="paypal_checkout_success">
         <observer name="signifyd_place_order_checkout_success_observer" instance="Magento\Signifyd\Observer\PlaceOrder" />
     </event>
+    <event name="checkout_onepage_controller_success_action">
+        <observer name="signifyd_place_order_checkout_success_observer" instance="Magento\Signifyd\Observer\PlaceOrder" />
+    </event>
 </config>