Update Fun Validators dependency

composer.json

@@ -14,8 +14,8 @@
 		"wmde/email-address": "~1.0",
 		"wmde/euro": "~1.0",
 		"wmde/freezable-value-object": "~1.0",
-		"wmde/fun-validators": "~1.2",
-		"wmde/fundraising-payments": "@dev"
+		"wmde/fun-validators": "~2.0.0",
+		"wmde/fundraising-payments": "~1.0.1"
 	},
 	"repositories": [
 		{
@@ -27,6 +27,11 @@
 			"type": "vcs",
 			"url": "https://github.com/wmde/fundraisingstore",
 			"no-api": true
+		},
+		{
+			"type": "vcs",
+			"url": "https://github.com/wmde/fun-validators",
+			"no-api": true
 		}
 	],
 	"require-dev": {

tests/Data/ValidDonation.php

@@ -38,7 +38,7 @@ class ValidDonation {
 	public const DONOR_COMPANY = 'Fluffy Beings Ltd.';
 
 	public const DONOR_CITY = 'Berlin';
-	public const DONOR_POSTAL_CODE = '1234';
+	public const DONOR_POSTAL_CODE = '12345';
 	public const DONOR_COUNTRY_CODE = 'DE';
 	public const DONOR_STREET_ADDRESS = 'Nyan Street';
 

tests/Data/ValidatorPatterns.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace WMDE\Fundraising\DonationContext\Tests\Data;
+
+class ValidatorPatterns {
+	public const COUNTRY_POSTCODE = [
+		'DE' => '/^[0-9]{5}$/',
+		'AT' => '/^[0-9]{4}$/',
+		'CH' => '/^[0-9]{4}$/',
+		'BE' => '/^[0-9]{4}$/',
+		'IT' => '/^[0-9]{5}$/',
+		'LI' => '/^[0-9]{4}$/',
+		'LU' => '/^[0-9]{4}$/',
+	];
+}

tests/Integration/UseCases/AddDonation/AddDonationValidatorTest.php

@@ -8,6 +8,7 @@
 use WMDE\Euro\Euro;
 use WMDE\Fundraising\DonationContext\Domain\Model\DonorName;
 use WMDE\Fundraising\DonationContext\Tests\Data\ValidAddDonationRequest;
+use WMDE\Fundraising\DonationContext\Tests\Data\ValidatorPatterns;
 use WMDE\Fundraising\DonationContext\Tests\Data\ValidDonation;
 use WMDE\Fundraising\DonationContext\UseCases\AddDonation\AddDonationValidationResult;
 use WMDE\Fundraising\DonationContext\UseCases\AddDonation\AddDonationValidator;
@@ -246,7 +247,7 @@ private function newEmptyIbanBlocklist(): IbanBlocklist {
 	}
 
 	private function newAddressValidator(): AddressValidator {
-		return new AddressValidator();
+		return new AddressValidator( ValidatorPatterns::COUNTRY_POSTCODE );
 	}
 
 }

tests/Unit/UseCases/UpdateDonor/UpdateDonorValidatorTest.php

@@ -5,6 +5,7 @@
 namespace WMDE\Fundraising\DonationContext\Tests\Unit\UseCases\UpdateDonor;
 
 use WMDE\Fundraising\DonationContext\Domain\Model\DonorName;
+use WMDE\Fundraising\DonationContext\Tests\Data\ValidatorPatterns;
 use WMDE\Fundraising\DonationContext\UseCases\UpdateDonor\UpdateDonorRequest;
 use WMDE\Fundraising\DonationContext\UseCases\UpdateDonor\UpdateDonorValidator;
 use PHPUnit\Framework\TestCase;
@@ -21,7 +22,7 @@
 class UpdateDonorValidatorTest extends TestCase {
 
 	public function testGivenAnonymousDonor_validationFails() {
-		$validator = new UpdateDonorValidator( new AddressValidator(), new SucceedingEmailValidator() );
+		$validator = new UpdateDonorValidator( new AddressValidator( ValidatorPatterns::COUNTRY_POSTCODE ), new SucceedingEmailValidator() );
 		$request = ( new UpdateDonorRequest() )->withType( DonorName::PERSON_ANONYMOUS );
 
 		$result = $validator->validateDonorData( $request );
@@ -57,7 +58,7 @@ public function testGivenFailingDonorValidator_validationFails() {
 
 	public function testgivenEmptyDonorRequestValues_validationFails() {
 		$validator = new UpdateDonorValidator(
-			new AddressValidator(),
+			new AddressValidator( ValidatorPatterns::COUNTRY_POSTCODE ),
 			new EmailValidator( new SucceedingDomainNameValidator() )
 		);
 		$result = $validator->validateDonorData( $this->newEmptyUpdateDonorRequest() );
@@ -75,7 +76,7 @@ public function testgivenEmptyDonorRequestValues_validationFails() {
 
 	public function testGivenInvalidCompanyDonor_validationFails() {
 		$validator = new UpdateDonorValidator(
-			new AddressValidator(),
+			new AddressValidator( ValidatorPatterns::COUNTRY_POSTCODE ),
 			new EmailValidator( new SucceedingDomainNameValidator() )
 		);
 		$result = $validator->validateDonorData( $this->newInvalidUpdateCompanyDonorRequest() );
@@ -108,7 +109,7 @@ private function newInvalidUpdateCompanyDonorRequest(): UpdateDonorRequest {
 			->withType( DonorName::PERSON_COMPANY )
 			->withCompanyName( str_repeat( 'TEST', 26 ) )
 			->withStreetAddress( str_repeat( 'TEST', 26 ) )
-			->withPostalCode( str_repeat( '1', 10 ) )
+			->withPostalCode( str_repeat( '1', 17 ) )
 			->withCity( str_repeat( 'TEST', 26 ) )
 			->withCountryCode( str_repeat( 'TEST', 26 ) )
 			->withEmailAddress( '' );