test: update tests for new thepay/api-client config structure

Rewrite DITest to verify new flat config (merchantId, projectId,
apiPassword, apiUrl, gateUrl, language) and demo endpoint switching.
Remove TpPaymentTest that tested deleted Payment/MerchantConfig classes.
Fix before callback to handle missing demo key.

Author: trejjam

src/DI/ThePayExtension.php

@@ -26,7 +26,7 @@ public function getConfigSchema(): Schema
 	{
 		return Expect::from($this->config)->before(
 			function (array $config): array {
-				if ($config['demo'] === true) {
+				if (($config['demo'] ?? false) === true) {
 					$this->config->setDemo();
 					$config['apiUrl'] = $this->config->apiUrl;
 					$config['gateUrl'] = $this->config->gateUrl;

tests/Cases/DITest.phpt

@@ -18,6 +18,9 @@ Toolkit::test(function (): void {
 		[
 			'thepay' => [
 				'demo' => true,
+				'merchantId' => 'test-merchant-id',
+				'projectId' => 3,
+				'apiPassword' => 'secret',
 			],
 		]
 	);
@@ -26,13 +29,12 @@ Toolkit::test(function (): void {
 	$thePayConfig = $thePayExtension->getConfig();
 
 	Assert::same(true, $thePayConfig->demo);
-	Assert::same('https://www.thepay.cz/demo-gate/', $thePayConfig->merchant->gateUrl);
-	Assert::same(1, $thePayConfig->merchant->merchantId);
-	Assert::same(1, $thePayConfig->merchant->accountId);
-	Assert::same('my$up3rsecr3tp4$$word', $thePayConfig->merchant->password);
-	Assert::same('my$up3rsecr3tp4$$word', $thePayConfig->merchant->dataApiPassword);
-	Assert::same('https://www.thepay.cz/demo-gate/api/gate-api-demo.wsdl', $thePayConfig->merchant->webServicesWsdl);
-	Assert::same('https://www.thepay.cz/demo-gate/api/data-demo.wsdl', $thePayConfig->merchant->dataWebServicesWsdl);
+	Assert::same('test-merchant-id', $thePayConfig->merchantId);
+	Assert::same(3, $thePayConfig->projectId);
+	Assert::same('secret', $thePayConfig->apiPassword);
+	Assert::same('https://demo.api.thepay.cz/', $thePayConfig->apiUrl);
+	Assert::same('https://demo.gate.thepay.cz/', $thePayConfig->gateUrl);
+	Assert::same('cs', $thePayConfig->language);
 });
 
 Toolkit::test(function (): void {
@@ -44,12 +46,9 @@ Toolkit::test(function (): void {
 		[
 			'thepay' => [
 				'demo' => false,
-				'merchant' => [
-					'merchantId' => 10,
-					'accountId' => 42,
-					'password' => 'abc',
-					'dataApiPassword' => 'def',
-				],
+				'merchantId' => 'prod-merchant-id',
+				'projectId' => 10,
+				'apiPassword' => 'prod-secret',
 			],
 		]
 	);
@@ -58,11 +57,40 @@ Toolkit::test(function (): void {
 	$thePayConfig = $thePayExtension->getConfig();
 
 	Assert::same(false, $thePayConfig->demo);
-	Assert::same('https://www.thepay.cz/gate/', $thePayConfig->merchant->gateUrl);
-	Assert::same(10, $thePayConfig->merchant->merchantId);
-	Assert::same(42, $thePayConfig->merchant->accountId);
-	Assert::same('abc', $thePayConfig->merchant->password);
-	Assert::same('def', $thePayConfig->merchant->dataApiPassword);
-	Assert::same('https://www.thepay.cz/gate/api/gate-api.wsdl', $thePayConfig->merchant->webServicesWsdl);
-	Assert::same('https://www.thepay.cz/gate/api/data.wsdl', $thePayConfig->merchant->dataWebServicesWsdl);
+	Assert::same('prod-merchant-id', $thePayConfig->merchantId);
+	Assert::same(10, $thePayConfig->projectId);
+	Assert::same('prod-secret', $thePayConfig->apiPassword);
+	Assert::same('https://api.thepay.cz/', $thePayConfig->apiUrl);
+	Assert::same('https://gate.thepay.cz/', $thePayConfig->gateUrl);
+	Assert::same('cs', $thePayConfig->language);
+});
+
+Toolkit::test(function (): void {
+	$thePayExtension = new ThePayExtension();
+
+	$compiler = new Compiler();
+	$compiler->addExtension('thepay', $thePayExtension);
+	$compiler->addConfig(
+		[
+			'thepay' => [
+				'merchantId' => 'custom-merchant',
+				'projectId' => 5,
+				'apiPassword' => 'pass',
+				'apiUrl' => 'https://custom.api.thepay.cz/',
+				'gateUrl' => 'https://custom.gate.thepay.cz/',
+				'language' => 'en',
+			],
+		]
+	);
+	$compiler->processExtensions();
+
+	$thePayConfig = $thePayExtension->getConfig();
+
+	Assert::same(false, $thePayConfig->demo);
+	Assert::same('custom-merchant', $thePayConfig->merchantId);
+	Assert::same(5, $thePayConfig->projectId);
+	Assert::same('pass', $thePayConfig->apiPassword);
+	Assert::same('https://custom.api.thepay.cz/', $thePayConfig->apiUrl);
+	Assert::same('https://custom.gate.thepay.cz/', $thePayConfig->gateUrl);
+	Assert::same('en', $thePayConfig->language);
 });