Merge pull request #98 from wmde/update-validators-dependency

Update Dependencies
wmde · Jun 18, 2020 · 56149db · 56149db
2 parents dc71033 + b9c2c0a
commit 56149db
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -14,8 +14,8 @@
 		"wmde/email-address": "~1.0",
 		"wmde/euro": "~1.0",
 		"wmde/freezable-value-object": "~1.0",
-		"wmde/fun-validators": "~2.0.0",
-		"wmde/fundraising-payments": "~1.0.1"
+		"wmde/fun-validators": "~3.0.0",
+		"wmde/fundraising-payments": "~1.0.0"
 	},
 	"repositories": [
 		{

diff --git a/tests/Data/ValidatorPatterns.php b/tests/Data/ValidatorPatterns.php
@@ -14,4 +14,10 @@ class ValidatorPatterns {
 		'LI' => '/^[0-9]{4}$/',
 		'LU' => '/^[0-9]{4}$/',
 	];
+
+	public const ADDRESS_PATTERNS = [
+		'firstName' => "/^[A-Za-z\u00C0-\u00D6\u00D8-\u00f6\u00f8-\u00ff\\s\\-\\.\\']+$/",
+		'lastName' => "/^[A-Za-z\u00C0-\u00D6\u00D8-\u00f6\u00f8-\u00ff\\s\\-\\.\\']+$/",
+		'postcode' => '/^.+$/',
+	];
 }
diff --git a/tests/Integration/UseCases/AddDonation/AddDonationValidatorTest.php b/tests/Integration/UseCases/AddDonation/AddDonationValidatorTest.php
@@ -247,7 +247,7 @@ private function newEmptyIbanBlocklist(): IbanBlocklist {
 	}
 
 	private function newAddressValidator(): AddressValidator {
-		return new AddressValidator( ValidatorPatterns::COUNTRY_POSTCODE );
+		return new AddressValidator( ValidatorPatterns::COUNTRY_POSTCODE, ValidatorPatterns::ADDRESS_PATTERNS );
 	}
 
 }
diff --git a/tests/Unit/UseCases/UpdateDonor/UpdateDonorValidatorTest.php b/tests/Unit/UseCases/UpdateDonor/UpdateDonorValidatorTest.php
@@ -22,7 +22,10 @@
 class UpdateDonorValidatorTest extends TestCase {
 
 	public function testGivenAnonymousDonor_validationFails() {
-		$validator = new UpdateDonorValidator( new AddressValidator( ValidatorPatterns::COUNTRY_POSTCODE ), new SucceedingEmailValidator() );
+		$validator = new UpdateDonorValidator(
+			new AddressValidator( ValidatorPatterns::COUNTRY_POSTCODE, ValidatorPatterns::ADDRESS_PATTERNS ),
+			new SucceedingEmailValidator()
+		);
 		$request = ( new UpdateDonorRequest() )->withType( DonorName::PERSON_ANONYMOUS );
 
 		$result = $validator->validateDonorData( $request );
@@ -58,7 +61,7 @@ public function testGivenFailingDonorValidator_validationFails() {
 
 	public function testgivenEmptyDonorRequestValues_validationFails() {
 		$validator = new UpdateDonorValidator(
-			new AddressValidator( ValidatorPatterns::COUNTRY_POSTCODE ),
+			new AddressValidator( ValidatorPatterns::COUNTRY_POSTCODE, ValidatorPatterns::ADDRESS_PATTERNS ),
 			new EmailValidator( new SucceedingDomainNameValidator() )
 		);
 		$result = $validator->validateDonorData( $this->newEmptyUpdateDonorRequest() );
@@ -76,7 +79,7 @@ public function testgivenEmptyDonorRequestValues_validationFails() {
 
 	public function testGivenInvalidCompanyDonor_validationFails() {
 		$validator = new UpdateDonorValidator(
-			new AddressValidator( ValidatorPatterns::COUNTRY_POSTCODE ),
+			new AddressValidator( ValidatorPatterns::COUNTRY_POSTCODE, ValidatorPatterns::ADDRESS_PATTERNS ),
 			new EmailValidator( new SucceedingDomainNameValidator() )
 		);
 		$result = $validator->validateDonorData( $this->newInvalidUpdateCompanyDonorRequest() );