Resolve conflicts

gcatanese · gcatanese · commit 10d1a1881679 · 2026-01-23T13:31:48.000Z
diff --git a/tests/Unit/NotificationTest.php b/tests/Unit/NotificationTest.php
@@ -682,6 +682,8 @@ public function testBankingWebhookParserRelayedAuthorisationRequest()
         self::assertEquals("Authorised", $result->getAuthorisationDecision()->getStatus());
         self::assertEquals("balancePlatform.authorisation.relayed", $result->getType());
         self::assertEquals("test", $result->getEnvironment());
+    }
+    
     public function testBankingWebhookParserReleasedBlockedBalanceNotificationRequest()
     {
         $jsonString = '{

Original file line number	Diff line number	Diff line change
`@@ -682,6 +682,8 @@ public function testBankingWebhookParserRelayedAuthorisationRequest()`
`682`	`682`	`self::assertEquals("Authorised", $result->getAuthorisationDecision()->getStatus());`
`683`	`683`	`self::assertEquals("balancePlatform.authorisation.relayed", $result->getType());`
`684`	`684`	`self::assertEquals("test", $result->getEnvironment());`
	`685`	`+ }`
	`686`	`+`
`685`	`687`	`public function testBankingWebhookParserReleasedBlockedBalanceNotificationRequest()`
`686`	`688`	`{`
`687`	`689`	`$jsonString = '{`