Fix tests

Author: damms005

src/Services/PaymentService.php

@@ -21,18 +21,18 @@ public static function storePaymentAndShowUserBeforeProcessing(?int $user_id, fl
 
     public static function getHandlerFqcn(string $uniqueName): BasePaymentHandler
     {
-        $handler = BasePaymentHandler::getNamesOfPaymentHandlers()->filter(fn ($name) => $name === $uniqueName);
+        $handlers = BasePaymentHandler::getNamesOfPaymentHandlers()->filter(fn($name) => $name === $uniqueName);
 
-        if ($handler->isEmpty()) {
+        if ($handlers->isEmpty()) {
             throw new \Exception("No handler found with name '{$uniqueName}'");
         }
 
-        if ($handler->count() !== 1) {
+        if ($handlers->count() !== 1) {
             throw new \Exception("Multiple handler found with name '{$uniqueName}'");
         }
 
-        return $handler
-            ->map(fn ($name, $key) => new $key())
+        return $handlers
+            ->map(fn($name, $key) => new $key())
             ->sole();
     }
 

tests/PaymentRequeryTest.php

@@ -6,7 +6,6 @@
 use Damms005\LaravelMultipay\Models\Payment;
 use Damms005\LaravelMultipay\ValueObjects\ReQuery;
 use Damms005\LaravelMultipay\Services\PaymentHandlers\Remita;
-use Damms005\LaravelMultipay\Contracts\PaymentHandlerInterface;
 use Damms005\LaravelMultipay\Services\PaymentHandlers\BasePaymentHandler;
 use Damms005\LaravelMultipay\Events\SuccessfulLaravelMultipayPaymentEvent;
 
@@ -24,22 +23,22 @@
 // it("processes payment webhooks", function () {});
 
 it('calls payment handler for payment re-query', function () {
-    app()->bind(PaymentHandlerInterface::class, function ($app) {
-        /**
-         * @var Mock<TObject>
-         */
-        $mock = mock(Remita::class);
-        $mock->makePartial();
-
-        $mock->expects('reQuery')->andReturn(
+    /**
+     * @var Mock<TObject>
+     */
+    $mock = mock(Remita::class);
+    $mock->makePartial();
+
+    $mock->shouldReceive('reQuery')
+        ->once()
+        ->andReturn(
             new ReQuery(
                 payment: new Payment(),
                 responseDetails: ['status' => 'Successful'],
             ),
         );
 
-        return $mock;
-    });
+    app()->bind(Remita::class, fn($app) => $mock);
 
     app()->make(BasePaymentHandler::class)->reQueryUnsuccessfulPayment(
         Payment::factory()->create(['payment_processor_name' => Remita::getUniquePaymentHandlerName()])
@@ -68,29 +67,29 @@
 
     Event::fake();
 
-    app()
-        ->make(BasePaymentHandler::class)
-        ->reQueryUnsuccessfulPayment(
-            Payment::factory()->create(['payment_processor_name' => Remita::getUniquePaymentHandlerName()])
-        );
+    app()->make(BasePaymentHandler::class)->reQueryUnsuccessfulPayment(
+        Payment::factory()->create(['payment_processor_name' => Remita::getUniquePaymentHandlerName()])
+    );
 
     Event::assertDispatched(SuccessfulLaravelMultipayPaymentEvent::class);
 });
 
 it('does not fire success events for re-query of unsuccessful payments', function () {
-    app()->bind(PaymentHandlerInterface::class, function ($app) {
+    app()->bind(Remita::class, function ($app) {
         /**
          * @var Mock<TObject>
          */
         $mock = mock(Remita::class);
         $mock->makePartial();
 
-        $mock->expects('reQuery')->andReturn(
-            new ReQuery(
-                payment: new Payment(['is_success' => false]),
-                responseDetails: ['status' => 'Went South!'],
-            ),
-        );
+        $mock->shouldReceive('reQuery')
+            ->once()
+            ->andReturn(
+                new ReQuery(
+                    payment: new Payment(['is_success' => false]),
+                    responseDetails: ['status' => 'Went South!'],
+                ),
+            );
 
         return $mock;
     });