Shorter event names

hakito · Jun 13, 2020 · 02c9241 · 02c9241
1 parent 6c461b4
commit 02c9241
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -80,7 +80,7 @@ $eventManager->setEventList(new EventList());
 
 // Will be called just after PayPal redirects the customer
 // back to your site. (You could start a transaction here)
-$eventManager->on('PayPal.Model.PayPalPayments.BeforePaymentExecution',
+$eventManager->on('PayPal.BeforePaymentExecution',
 function($event, $remittanceIdentifier, &$handled)
 {
     // Handled is expected to be set to TRUE, otherwise the plugin
@@ -91,13 +91,13 @@ function($event, $remittanceIdentifier, &$handled)
 // Will be called when the REST api call fails or
 // the saleState != 'completed' or paymentState != 'approved'
 // (You could rollback a transaction here)
-$eventManager->on('PayPal.Model.PayPalPayments.CancelPaymentExecution',
+$eventManager->on('PayPal.CancelPaymentExecution',
 function($event, $remittanceIdentifier) {});
 
 // Will be called after the REST api call
 // and only if the saleState == 'completed' and paymentState == 'approved'
 // (You could commit a transaction here)
-$eventManager->on('PayPal.Model.PayPalPayments.AfterPaymentExecution',
+$eventManager->on('PayPal.AfterPaymentExecution',
 function($event, $remittanceIdentifier) {});
 
 ```

diff --git a/src/Model/Table/PayPalPaymentsTable.php b/src/Model/Table/PayPalPaymentsTable.php
@@ -117,11 +117,11 @@ public function execute($id)
         $execution = new PaymentExecution();
         $execution->setPayerId($_GET['PayerID']);
         $handled = false;
-        $event = new Event('PayPal.Model.PayPalPayments.BeforePaymentExecution',
+        $event = new Event('PayPal.BeforePaymentExecution',
             $this, ['RemittanceIdentifier' => $remittanceIdentifier, 'Handled' => &$handled] );
         $this->getEventManager()->dispatch($event);
         if (!$handled)
-            throw new PayPalCallbackException('PayPal.Model.PayPalPayments.BeforePaymentExecution was not properly handled');
+            throw new PayPalCallbackException('PayPal.BeforePaymentExecution was not properly handled');
 
         $event = null;
         try
@@ -133,13 +133,13 @@ public function execute($id)
             $sale = $relatedResources->getSale();
             $saleState = $sale->getState();
             if ($saleState == 'completed' && $paymentState == 'approved')
-                $event = new Event('PayPal.Model.PayPalPayments.AfterPaymentExecution',
+                $event = new Event('PayPal.AfterPaymentExecution',
                     $this, ['RemittanceIdentifier' => $remittanceIdentifier]);
         }
         finally
         {
             if ($event == null)
-                $event = new Event('PayPal.Model.PayPalPayments.CancelPaymentExecution',
+                $event = new Event('PayPal.CancelPaymentExecution',
                     $this, ['RemittanceIdentifier' => $remittanceIdentifier]);
 
             $this->getEventManager()->dispatch($event);

diff --git a/tests/TestCase/Model/Table/PayPalPaymentsTableTest.php b/tests/TestCase/Model/Table/PayPalPaymentsTableTest.php
@@ -202,7 +202,7 @@ private function prepareExecuteTest($saleState = 'completed', $paymentState = 'a
             ->method('getRelatedResources')
             ->willReturn($rr);
 
-        $model->getEventManager()->on('PayPal.Model.PayPalPayments.BeforePaymentExecution',
+        $model->getEventManager()->on('PayPal.BeforePaymentExecution',
         function($event, $remittanceIdentifier, &$handled)
         {
             $handled = true;
@@ -220,26 +220,26 @@ public function testExecuteCompletedAndApproved()
         $model = $this->prepareExecuteTest();
 
         $model->execute(1);
-        $this->assertEventFiredWith('PayPal.Model.PayPalPayments.BeforePaymentExecution', 'RemittanceIdentifier', 'ri', $model->getEventManager());
-        $this->assertEventFiredWith('PayPal.Model.PayPalPayments.AfterPaymentExecution', 'RemittanceIdentifier', 'ri', $model->getEventManager());
+        $this->assertEventFiredWith('PayPal.BeforePaymentExecution', 'RemittanceIdentifier', 'ri', $model->getEventManager());
+        $this->assertEventFiredWith('PayPal.AfterPaymentExecution', 'RemittanceIdentifier', 'ri', $model->getEventManager());
     }
 
     public function testExecuteCancelOnInvalidSaleState()
     {
         $model = $this->prepareExecuteTest('invalid');
 
         $model->execute(1);
-        $this->assertEventFiredWith('PayPal.Model.PayPalPayments.BeforePaymentExecution', 'RemittanceIdentifier', 'ri', $model->getEventManager());
-        $this->assertEventFiredWith('PayPal.Model.PayPalPayments.CancelPaymentExecution', 'RemittanceIdentifier', 'ri', $model->getEventManager());
+        $this->assertEventFiredWith('PayPal.BeforePaymentExecution', 'RemittanceIdentifier', 'ri', $model->getEventManager());
+        $this->assertEventFiredWith('PayPal.CancelPaymentExecution', 'RemittanceIdentifier', 'ri', $model->getEventManager());
     }
 
     public function testExecuteCancelOnInvalidPaymentState()
     {
         $model = $this->prepareExecuteTest('completed', 'invalid');
 
         $model->execute(1);
-        $this->assertEventFiredWith('PayPal.Model.PayPalPayments.BeforePaymentExecution', 'RemittanceIdentifier', 'ri', $model->getEventManager());
-        $this->assertEventFiredWith('PayPal.Model.PayPalPayments.CancelPaymentExecution', 'RemittanceIdentifier', 'ri', $model->getEventManager());
+        $this->assertEventFiredWith('PayPal.BeforePaymentExecution', 'RemittanceIdentifier', 'ri', $model->getEventManager());
+        $this->assertEventFiredWith('PayPal.CancelPaymentExecution', 'RemittanceIdentifier', 'ri', $model->getEventManager());
     }
 
     public function testExecuteCancelOnException()
@@ -263,7 +263,7 @@ public function testExecuteCancelOnException()
             ->method('ApiGet')
             ->with('PayPalId')
             ->willReturn($p);
-        $model->getEventManager()->on('PayPal.Model.PayPalPayments.BeforePaymentExecution',
+        $model->getEventManager()->on('PayPal.BeforePaymentExecution',
         function($event, $remittanceIdentifier, &$handled)
         {
             $handled = true;
@@ -274,8 +274,8 @@ function($event, $remittanceIdentifier, &$handled)
         } catch (\Exception $th) {
             $this->assertEquals('dummy', $th->getMessage());
         }
-        $this->assertEventFiredWith('PayPal.Model.PayPalPayments.BeforePaymentExecution', 'RemittanceIdentifier', 'ri', $model->getEventManager());
-        $this->assertEventFiredWith('PayPal.Model.PayPalPayments.CancelPaymentExecution', 'RemittanceIdentifier', 'ri', $model->getEventManager());
+        $this->assertEventFiredWith('PayPal.BeforePaymentExecution', 'RemittanceIdentifier', 'ri', $model->getEventManager());
+        $this->assertEventFiredWith('PayPal.CancelPaymentExecution', 'RemittanceIdentifier', 'ri', $model->getEventManager());
     }
 
     public function testGetRelatedResources()