wmde / FundraisingFrontend

app/RouteHandlers/AddDonationHandler.php

Spacing +74 added lines, -74 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types = 1);
 
 namespace WMDE\Fundraising\Frontend\App\RouteHandlers;
 
@@ -27,47 +27,47 @@ 
 	private $ffFactory;
 	private $app;
 
-	public function __construct( FunFunFactory $ffFactory, Application $app ) {
+	public function __construct(FunFunFactory $ffFactory, Application $app) {
 		$this->ffFactory = $ffFactory;
 		$this->app = $app;
 	}
 
-	public function handle( Request $request ): Response {
-		if ( !$this->isSubmissionAllowed( $request ) ) {
-			return new Response( $this->ffFactory->newSystemMessageResponse( 'donation_rejected_limit' ) );
+	public function handle(Request $request): Response {
+		if (!$this->isSubmissionAllowed($request)) {
+			return new Response($this->ffFactory->newSystemMessageResponse('donation_rejected_limit'));
 		}
 
-		$addDonationRequest = $this->createDonationRequest( $request );
-		$responseModel = $this->ffFactory->newAddDonationUseCase()->addDonation( $addDonationRequest );
+		$addDonationRequest = $this->createDonationRequest($request);
+		$responseModel = $this->ffFactory->newAddDonationUseCase()->addDonation($addDonationRequest);
 
-		if ( !$responseModel->isSuccessful() ) {
+		if (!$responseModel->isSuccessful()) {
 			return new Response(
 				$this->ffFactory->newDonationFormViolationPresenter()->present(
 					$responseModel->getValidationErrors(), $addDonationRequest,
-					$this->newTrackingInfoFromRequest( $request )
+					$this->newTrackingInfoFromRequest($request)
 				)
 			);
 		}
 
-		$this->sendTrackingDataIfNeeded( $request, $responseModel );
+		$this->sendTrackingDataIfNeeded($request, $responseModel);
 
-		return $this->newHttpResponse( $responseModel );
+		return $this->newHttpResponse($responseModel);
 	}
 
-	private function sendTrackingDataIfNeeded( Request $request, AddDonationResponse $responseModel ) {
-		if ( $request->get( 'mbt', '' ) !== '1' || $responseModel->getDonation()->getPaymentType() !== PaymentType::PAYPAL ) {
+	private function sendTrackingDataIfNeeded(Request $request, AddDonationResponse $responseModel) {
+		if ($request->get('mbt', '') !== '1' || $responseModel->getDonation()->getPaymentType() !== PaymentType::PAYPAL) {
 			return;
 		}
 
-		$trackingCode = explode( '/', $request->attributes->get( 'trackingCode' ) );
+		$trackingCode = explode('/', $request->attributes->get('trackingCode'));
 		$campaign = $trackingCode[0];
 		$keyword = $trackingCode[1] ?? '';
 
-		$this->ffFactory->getPageViewTracker()->trackPaypalRedirection( $campaign, $keyword, $request->getClientIp() );
+		$this->ffFactory->getPageViewTracker()->trackPaypalRedirection($campaign, $keyword, $request->getClientIp());
 	}
 
-	private function newHttpResponse( AddDonationResponse $responseModel ): Response {
-		switch( $responseModel->getDonation()->getPaymentType() ) {
+	private function newHttpResponse(AddDonationResponse $responseModel): Response {
+		switch ($responseModel->getDonation()->getPaymentType()) {
 			case PaymentType::DIRECT_DEBIT:
 			case PaymentType::BANK_TRANSFER:
 				$httpResponse = $this->app->redirect(
@@ -95,105 +95,105 @@ 
 				break;
 			case PaymentType::CREDIT_CARD:
 				$httpResponse = new Response(
-					$this->ffFactory->newCreditCardPaymentHtmlPresenter()->present( $responseModel )
+					$this->ffFactory->newCreditCardPaymentHtmlPresenter()->present($responseModel)
 				);
 				break;
 			default:
-				throw new \LogicException( 'This code should not be reached' );
+				throw new \LogicException('This code should not be reached');
 		}
 		return $httpResponse;
 	}
 
-	private function createDonationRequest( Request $request ): AddDonationRequest {
+	private function createDonationRequest(Request $request): AddDonationRequest {
 		$donationRequest = new AddDonationRequest();
 
-		$donationRequest->setAmount( $this->getEuroAmountFromString( $request->get( 'betrag', '' ) ) );
-
-		$donationRequest->setPaymentType( $request->get( 'zahlweise', '' ) );
-		$donationRequest->setInterval( intval( $request->get( 'periode', 0 ) ) );
-
-		$donationRequest->setDonorType( $request->get( 'addressType', '' ) );
-		$donationRequest->setDonorSalutation( $request->get( 'salutation', '' ) );
-		$donationRequest->setDonorTitle( $request->get( 'title', '' ) );
-		$donationRequest->setDonorCompany( $request->get( 'companyName', '' ) );
-		$donationRequest->setDonorFirstName( $request->get( 'firstName', '' ) );
-		$donationRequest->setDonorLastName( $request->get( 'lastName', '' ) );
-		$donationRequest->setDonorStreetAddress( $this->filterAutofillCommas( $request->get( 'street', '' ) ) );
-		$donationRequest->setDonorPostalCode( $request->get( 'postcode', '' ) );
-		$donationRequest->setDonorCity( $request->get( 'city', '' ) );
-		$donationRequest->setDonorCountryCode( $request->get( 'country', '' ) );
-		$donationRequest->setDonorEmailAddress( $request->get( 'email', '' ) );
-
-		if ( $request->get( 'zahlweise', '' ) === PaymentType::DIRECT_DEBIT ) {
-			$donationRequest->setBankData( $this->getBankDataFromRequest( $request ) );
+		$donationRequest->setAmount($this->getEuroAmountFromString($request->get('betrag', '')));
+
+		$donationRequest->setPaymentType($request->get('zahlweise', ''));
+		$donationRequest->setInterval(intval($request->get('periode', 0)));
+
+		$donationRequest->setDonorType($request->get('addressType', ''));
+		$donationRequest->setDonorSalutation($request->get('salutation', ''));
+		$donationRequest->setDonorTitle($request->get('title', ''));
+		$donationRequest->setDonorCompany($request->get('companyName', ''));
+		$donationRequest->setDonorFirstName($request->get('firstName', ''));
+		$donationRequest->setDonorLastName($request->get('lastName', ''));
+		$donationRequest->setDonorStreetAddress($this->filterAutofillCommas($request->get('street', '')));
+		$donationRequest->setDonorPostalCode($request->get('postcode', ''));
+		$donationRequest->setDonorCity($request->get('city', ''));
+		$donationRequest->setDonorCountryCode($request->get('country', ''));
+		$donationRequest->setDonorEmailAddress($request->get('email', ''));
+
+		if ($request->get('zahlweise', '') === PaymentType::DIRECT_DEBIT) {
+			$donationRequest->setBankData($this->getBankDataFromRequest($request));
 		}
 
-		$donationRequest->setTracking( $request->attributes->get( 'trackingCode' ) );
-		$donationRequest->setOptIn( $request->get( 'info', '' ) );
-		$donationRequest->setSource( $request->attributes->get( 'trackingSource' ) );
-		$donationRequest->setTotalImpressionCount( intval( $request->get( 'impCount', 0 ) ) );
-		$donationRequest->setSingleBannerImpressionCount( intval( $request->get( 'bImpCount', 0 ) ) );
+		$donationRequest->setTracking($request->attributes->get('trackingCode'));
+		$donationRequest->setOptIn($request->get('info', ''));
+		$donationRequest->setSource($request->attributes->get('trackingSource'));
+		$donationRequest->setTotalImpressionCount(intval($request->get('impCount', 0)));
+		$donationRequest->setSingleBannerImpressionCount(intval($request->get('bImpCount', 0)));
 
 		return $donationRequest;
 	}
 
-	private function getBankDataFromRequest( Request $request ): BankData {
+	private function getBankDataFromRequest(Request $request): BankData {
 		$bankData = new BankData();
-		$bankData->setIban( new Iban( $request->get( 'iban', '' ) ) )
-			->setBic( $request->get( 'bic', '' ) )
-			->setAccount( $request->get( 'konto', '' ) )
-			->setBankCode( $request->get( 'blz', '' ) )
-			->setBankName( $request->get( 'bankname', '' ) );
-
-		if ( $bankData->hasIban() && !$bankData->hasBic() && !$bankData->hasCompleteLegacyBankData() ) {
-			$bankData = $this->newBankDataFromIban( $bankData->getIban() );
+		$bankData->setIban(new Iban($request->get('iban', '')))
+			->setBic($request->get('bic', ''))
+			->setAccount($request->get('konto', ''))
+			->setBankCode($request->get('blz', ''))
+			->setBankName($request->get('bankname', ''));
+
+		if ($bankData->hasIban() && !$bankData->hasBic() && !$bankData->hasCompleteLegacyBankData()) {
+			$bankData = $this->newBankDataFromIban($bankData->getIban());
 		}
-		if ( $bankData->hasCompleteLegacyBankData() && !$bankData->hasIban() ) {
-			$bankData = $this->newBankDataFromAccountAndBankCode( $bankData->getAccount(), $bankData->getBankCode() );
+		if ($bankData->hasCompleteLegacyBankData() && !$bankData->hasIban()) {
+			$bankData = $this->newBankDataFromAccountAndBankCode($bankData->getAccount(), $bankData->getBankCode());
 		}
 
 		return $bankData->freeze()->assertNoNullFields();
 	}
 
-	private function newBankDataFromIban( Iban $iban ): BankData {
-		return $this->ffFactory->newBankDataConverter()->getBankDataFromIban( $iban );
+	private function newBankDataFromIban(Iban $iban): BankData {
+		return $this->ffFactory->newBankDataConverter()->getBankDataFromIban($iban);
 	}
 
-	private function newBankDataFromAccountAndBankCode( string $account, string $bankCode ): BankData {
-		return $this->ffFactory->newBankDataConverter()->getBankDataFromAccountData( $account, $bankCode );
+	private function newBankDataFromAccountAndBankCode(string $account, string $bankCode): BankData {
+		return $this->ffFactory->newBankDataConverter()->getBankDataFromAccountData($account, $bankCode);
 	}
 
-	private function getEuroAmountFromString( string $amount ): Euro {
+	private function getEuroAmountFromString(string $amount): Euro {
 		$locale = 'de_DE'; // TODO: make this configurable for multilanguage support
 		try {
-			return Euro::newFromFloat( ( new AmountParser( $locale ) )->parseAsFloat( $amount ) );
-		} catch ( \InvalidArgumentException $ex ) {
-			return Euro::newFromCents( 0 );
+			return Euro::newFromFloat((new AmountParser($locale))->parseAsFloat($amount));
+		} catch (\InvalidArgumentException $ex) {
+			return Euro::newFromCents(0);
 		}
 
 	}
 
-	private function isSubmissionAllowed( Request $request ) {
-		$lastSubmission = $request->cookies->get( ShowDonationConfirmationHandler::SUBMISSION_COOKIE_NAME, '' );
-		if ( $lastSubmission === '' ) {
+	private function isSubmissionAllowed(Request $request) {
+		$lastSubmission = $request->cookies->get(ShowDonationConfirmationHandler::SUBMISSION_COOKIE_NAME, '');
+		if ($lastSubmission === '') {
 			return true;
 		}
 
 		$minNextTimestamp =
-			\DateTime::createFromFormat( ShowDonationConfirmationHandler::TIMESTAMP_FORMAT, $lastSubmission )
-			->add( new \DateInterval( $this->ffFactory->getDonationTimeframeLimit() ) );
+			\DateTime::createFromFormat(ShowDonationConfirmationHandler::TIMESTAMP_FORMAT, $lastSubmission)
+			->add(new \DateInterval($this->ffFactory->getDonationTimeframeLimit()));
 
-		if ( $minNextTimestamp > new \DateTime() ) {
+		if ($minNextTimestamp > new \DateTime()) {
 			return false;
 		}
 
 		return true;
 	}
 
-	private function newTrackingInfoFromRequest( Request $request ): DonationTrackingInfo {
+	private function newTrackingInfoFromRequest(Request $request): DonationTrackingInfo {
 		$tracking = new DonationTrackingInfo();
-		$tracking->setSingleBannerImpressionCount( intval( $request->get( 'bImpCount', 0 ) ) );
-		$tracking->setTotalImpressionCount( intval( $request->get( 'impCount', 0 ) ) );
+		$tracking->setSingleBannerImpressionCount(intval($request->get('bImpCount', 0)));
+		$tracking->setTotalImpressionCount(intval($request->get('impCount', 0)));
 
 		return $tracking;
 	}
@@ -205,7 +205,7 @@ 
 	 * @param string $value
 	 * @return string
 	 */
-	private function filterAutofillCommas( string $value ): string {
-		return trim( preg_replace( ['/,/', '/\s{2,}/'], [' ', ' '], $value ) );
+	private function filterAutofillCommas(string $value): string {
+		return trim(preg_replace(['/,/', '/\s{2,}/'], [' ', ' '], $value));
 	}
 }
\ No newline at end of file

contexts/PaymentContext/src/Domain/Model/BankData.php

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types = 1);
 
 namespace WMDE\Fundraising\Frontend\PaymentContext\Domain\Model;
 
@@ -24,7 +24,7 @@ 
 		return $this->bic;
 	}
 
-	public function setBic( string $bic ) {
+	public function setBic(string $bic) {
 		$this->assertIsWritable();
 		$this->bic = $bic;
 		return $this;
@@ -34,7 +34,7 @@ 
 		return $this->iban;
 	}
 
-	public function setIban( Iban $iban ) {
+	public function setIban(Iban $iban) {
 		$this->assertIsWritable();
 		$this->iban = $iban;
 		return $this;
@@ -44,7 +44,7 @@ 
 		return $this->account;
 	}
 
-	public function setAccount( string $account ) {
+	public function setAccount(string $account) {
 		$this->assertIsWritable();
 		$this->account = $account;
 		return $this;
@@ -54,7 +54,7 @@ 
 		return $this->bankCode;
 	}
 
-	public function setBankCode( string $bankCode ) {
+	public function setBankCode(string $bankCode) {
 		$this->assertIsWritable();
 		$this->bankCode = $bankCode;
 		return $this;
@@ -64,22 +64,22 @@ 
 		return $this->bankName;
 	}
 
-	public function setBankName( string $bankName ) {
+	public function setBankName(string $bankName) {
 		$this->assertIsWritable();
 		$this->bankName = $bankName;
 		return $this;
 	}
 
 	public function hasIban(): bool {
-		return !empty( $this->getIban()->toString() );
+		return !empty($this->getIban()->toString());
 	}
 
 	public function hasBic(): bool {
-		return !empty( $this->getBic() );
+		return !empty($this->getBic());
 	}
 
 	public function hasCompleteLegacyBankData(): bool {
-		return !empty( $this->getAccount() ) || !empty( $this->getBankCode() );
+		return !empty($this->getAccount()) || !empty($this->getBankCode());
 	}
 
 }

contexts/MembershipContext/tests/Unit/UseCases/ApplyForMembership/MembershipApplicationValidatorTest.php

Spacing +99 added lines, -99 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types = 1);
 
 namespace WMDE\Fundraising\Frontend\MembershipContext\Tests\Unit\UseCases\ApplyForMembership;
 
@@ -51,11 +51,11 @@ 
 
 	public function testGivenValidRequest_validationSucceeds() {
 		$validRequest = $this->newValidRequest();
-		$response = $this->newValidator()->validate( $validRequest );
+		$response = $this->newValidator()->validate($validRequest);
 
-		$this->assertEquals( new Result(), $response );
-		$this->assertEmpty( $response->getViolationSources() );
-		$this->assertTrue( $response->isSuccessful() );
+		$this->assertEquals(new Result(), $response);
+		$this->assertEmpty($response->getViolationSources());
+		$this->assertTrue($response->isSuccessful());
 	}
 
 	private function newValidator() {
@@ -69,27 +69,27 @@ 
 	public function testWhenFeeValidationFails_overallValidationAlsoFails() {
 		$this->feeValidator = $this->newFailingFeeValidator();
 
-		$response = $this->newValidator()->validate( $this->newValidRequest() );
+		$response = $this->newValidator()->validate($this->newValidRequest());
 
-		$this->assertEquals( $this->newFeeViolationResult(), $response );
+		$this->assertEquals($this->newFeeViolationResult(), $response);
 	}
 
 	private function newFailingFeeValidator(): MembershipFeeValidator {
-		$feeValidator = $this->getMockBuilder( MembershipFeeValidator::class )
+		$feeValidator = $this->getMockBuilder(MembershipFeeValidator::class)
 			->disableOriginalConstructor()->getMock();
 
-		$feeValidator->method( 'validate' )
-			->willReturn( $this->newFeeViolationResult() );
+		$feeValidator->method('validate')
+			->willReturn($this->newFeeViolationResult());
 
 		return $feeValidator;
 	}
 
 	private function newSucceedingFeeValidator(): MembershipFeeValidator {
-		$feeValidator = $this->getMockBuilder( MembershipFeeValidator::class )
+		$feeValidator = $this->getMockBuilder(MembershipFeeValidator::class)
 			->disableOriginalConstructor()->getMock();
 
-		$feeValidator->method( 'validate' )
-			->willReturn( new Result() );
+		$feeValidator->method('validate')
+			->willReturn(new Result());
 
 		return $feeValidator;
 	}
@@ -99,17 +99,17 @@ 
 	}
 
 	private function newFeeViolationResult() {
-		return new Result( [
+		return new Result([
 			Result::SOURCE_PAYMENT_AMOUNT => Result::VIOLATION_NOT_MONEY
-		] );
+		]);
 	}
 
 	private function newSucceedingBankDataValidator(): BankDataValidator {
-		$feeValidator = $this->getMockBuilder( BankDataValidator::class )
+		$feeValidator = $this->getMockBuilder(BankDataValidator::class)
 			->disableOriginalConstructor()->getMock();
 
-		$feeValidator->method( 'validate' )
-			->willReturn( new ValidationResult() );
+		$feeValidator->method('validate')
+			->willReturn(new ValidationResult());
 
 		return $feeValidator;
 	}
@@ -118,31 +118,31 @@ 
 		$this->bankDataValidator = $this->newRealBankDataValidator();
 
 		$request = $this->newValidRequest();
-		$request->getBankData()->setIban( new Iban( '' ) );
+		$request->getBankData()->setIban(new Iban(''));
 
 		$this->assertRequestValidationResultInErrors(
 			$request,
-			[ Result::SOURCE_IBAN => Result::VIOLATION_MISSING ]
+			[Result::SOURCE_IBAN => Result::VIOLATION_MISSING]
 		);
 	}
 
-	private function assertRequestValidationResultInErrors( ApplyForMembershipRequest $request, array $expectedErrors ) {
+	private function assertRequestValidationResultInErrors(ApplyForMembershipRequest $request, array $expectedErrors) {
 		$this->assertEquals(
-			new Result( $expectedErrors ),
-			$this->newValidator()->validate( $request )
+			new Result($expectedErrors),
+			$this->newValidator()->validate($request)
 		);
 	}
 
 	private function newRealBankDataValidator(): BankDataValidator {
-		return new BankDataValidator( $this->newSucceedingIbanValidator() );
+		return new BankDataValidator($this->newSucceedingIbanValidator());
 	}
 
 	private function newSucceedingIbanValidator(): IbanValidator {
-		$ibanValidator = $this->getMockBuilder( IbanValidator::class )
+		$ibanValidator = $this->getMockBuilder(IbanValidator::class)
 			->disableOriginalConstructor()->getMock();
 
-		$ibanValidator->method( 'validate' )
-			->willReturn( new ValidationResult() );
+		$ibanValidator->method('validate')
+			->willReturn(new ValidationResult());
 
 		return $ibanValidator;
 	}
@@ -151,11 +151,11 @@ 
 		$this->bankDataValidator = $this->newRealBankDataValidator();
 
 		$request = $this->newValidRequest();
-		$request->getBankData()->setBic( '' );
+		$request->getBankData()->setBic('');
 
 		$this->assertRequestValidationResultInErrors(
 			$request,
-			[ Result::SOURCE_BIC => Result::VIOLATION_MISSING ]
+			[Result::SOURCE_BIC => Result::VIOLATION_MISSING]
 		);
 	}
 
@@ -163,23 +163,23 @@ 
 		$this->bankDataValidator = $this->newRealBankDataValidator();
 
 		$request = $this->newValidRequest();
-		$request->getBankData()->setBankName( '' );
-		$response = $this->newValidator()->validate( $request );
+		$request->getBankData()->setBankName('');
+		$response = $this->newValidator()->validate($request);
 
-		$this->assertEquals( new Result(), $response );
-		$this->assertEmpty( $response->getViolationSources() );
-		$this->assertTrue( $response->isSuccessful() );
+		$this->assertEquals(new Result(), $response);
+		$this->assertEmpty($response->getViolationSources());
+		$this->assertTrue($response->isSuccessful());
 	}
 
 	public function testWhenBankCodeIsMissing_validationFails() {
 		$this->bankDataValidator = $this->newRealBankDataValidator();
 
 		$request = $this->newValidRequest();
-		$request->getBankData()->setBankCode( '' );
+		$request->getBankData()->setBankCode('');
 
 		$this->assertRequestValidationResultInErrors(
 			$request,
-			[ Result::SOURCE_BANK_CODE => Result::VIOLATION_MISSING ]
+			[Result::SOURCE_BANK_CODE => Result::VIOLATION_MISSING]
 		);
 	}
 
@@ -187,11 +187,11 @@ 
 		$this->bankDataValidator = $this->newRealBankDataValidator();
 
 		$request = $this->newValidRequest();
-		$request->getBankData()->setAccount( '' );
+		$request->getBankData()->setAccount('');
 
 		$this->assertRequestValidationResultInErrors(
 			$request,
-			[ Result::SOURCE_BANK_ACCOUNT => Result::VIOLATION_MISSING ]
+			[Result::SOURCE_BANK_ACCOUNT => Result::VIOLATION_MISSING]
 		);
 	}
 
@@ -199,11 +199,11 @@ 
 		$this->bankDataValidator = $this->newRealBankDataValidator();
 
 		$request = $this->newValidRequest();
-		$request->getBankData()->setAccount( '01189998819991197253' );
+		$request->getBankData()->setAccount('01189998819991197253');
 
 		$this->assertRequestValidationResultInErrors(
 			$request,
-			[ Result::SOURCE_BANK_ACCOUNT => Result::VIOLATION_WRONG_LENGTH ]
+			[Result::SOURCE_BANK_ACCOUNT => Result::VIOLATION_WRONG_LENGTH]
 		);
 	}
 
@@ -211,40 +211,40 @@ 
 		$this->bankDataValidator = $this->newRealBankDataValidator();
 
 		$request = $this->newValidRequest();
-		$request->getBankData()->setBankCode( '01189998819991197253' );
+		$request->getBankData()->setBankCode('01189998819991197253');
 
 		$this->assertRequestValidationResultInErrors(
 			$request,
-			[ Result::SOURCE_BANK_CODE => Result::VIOLATION_WRONG_LENGTH ]
+			[Result::SOURCE_BANK_CODE => Result::VIOLATION_WRONG_LENGTH]
 		);
 	}
 
 	public function testWhenDateOfBirthIsNotDate_validationFails() {
 		$request = $this->newValidRequest();
-		$request->setApplicantDateOfBirth( 'this is not a valid date' );
+		$request->setApplicantDateOfBirth('this is not a valid date');
 
 		$this->assertRequestValidationResultInErrors(
 			$request,
-			[ Result::SOURCE_APPLICANT_DATE_OF_BIRTH => Result::VIOLATION_NOT_DATE ]
+			[Result::SOURCE_APPLICANT_DATE_OF_BIRTH => Result::VIOLATION_NOT_DATE]
 		);
 	}
 
 	/**
 	 * @dataProvider invalidPhoneNumberProvider
 	 */
-	public function testWhenApplicantPhoneNumberIsInvalid_validationFails( string $invalidPhoneNumber ) {
+	public function testWhenApplicantPhoneNumberIsInvalid_validationFails(string $invalidPhoneNumber) {
 		$request = $this->newValidRequest();
-		$request->setApplicantPhoneNumber( $invalidPhoneNumber );
+		$request->setApplicantPhoneNumber($invalidPhoneNumber);
 
 		$this->assertRequestValidationResultInErrors(
 			$request,
-			[ Result::SOURCE_APPLICANT_PHONE_NUMBER => Result::VIOLATION_NOT_PHONE_NUMBER ]
+			[Result::SOURCE_APPLICANT_PHONE_NUMBER => Result::VIOLATION_NOT_PHONE_NUMBER]
 		);
 	}
 
 	public function invalidPhoneNumberProvider() {
 		return [
-			'potato' => [ 'potato' ],
+			'potato' => ['potato'],
 
 			// TODO: we use the regex from the old app, which allows for lots of bugus. Improve when time
 //			'number plus stuff' => [ '01189998819991197253 (invalid edition)' ],
@@ -254,23 +254,23 @@ 
 	/**
 	 * @dataProvider emailViolationTypeProvider
 	 */
-	public function testWhenApplicantEmailIsInvalid_validationFails( string $emailViolationType ) {
-		$this->emailValidator = $this->newFailingEmailValidator( $emailViolationType );
+	public function testWhenApplicantEmailIsInvalid_validationFails(string $emailViolationType) {
+		$this->emailValidator = $this->newFailingEmailValidator($emailViolationType);
 
 		$request = $this->newValidRequest();
-		$request->setApplicantEmailAddress( 'this is not a valid email' );
+		$request->setApplicantEmailAddress('this is not a valid email');
 
 		$this->assertRequestValidationResultInErrors(
 			$request,
-			[ Result::SOURCE_APPLICANT_EMAIL => Result::VIOLATION_NOT_EMAIL ]
+			[Result::SOURCE_APPLICANT_EMAIL => Result::VIOLATION_NOT_EMAIL]
 		);
 	}
 
 	public function emailViolationTypeProvider() {
 		return [
-			[ 'email_address_wrong_format' ],
-			[ 'email_address_invalid' ],
-			[ 'email_address_domain_record_not_found' ],
+			['email_address_wrong_format'],
+			['email_address_invalid'],
+			['email_address_domain_record_not_found'],
 		];
 	}
 
@@ -279,12 +279,12 @@ 
 	 *
 	 * @return EmailValidator
 	 */
-	private function newFailingEmailValidator( string $violationType ): EmailValidator {
-		$feeValidator = $this->getMockBuilder( EmailValidator::class )
+	private function newFailingEmailValidator(string $violationType): EmailValidator {
+		$feeValidator = $this->getMockBuilder(EmailValidator::class)
 			->disableOriginalConstructor()->getMock();
 
-		$feeValidator->method( 'validate' )
-			->willReturn( new ValidationResult( new ConstraintViolation( 'this is not a valid email', $violationType ) ) );
+		$feeValidator->method('validate')
+			->willReturn(new ValidationResult(new ConstraintViolation('this is not a valid email', $violationType)));
 
 		return $feeValidator;
 	}
@@ -292,109 +292,109 @@ 
 	public function testWhenCompanyIsMissingFromCompanyApplication_validationFails() {
 		$request = $this->newValidRequest();
 		$request->markApplicantAsCompany();
-		$request->setApplicantCompanyName( '' );
+		$request->setApplicantCompanyName('');
 
 		$this->assertRequestValidationResultInErrors(
 			$request,
-			[ Result::SOURCE_APPLICANT_COMPANY => Result::VIOLATION_MISSING ]
+			[Result::SOURCE_APPLICANT_COMPANY => Result::VIOLATION_MISSING]
 		);
 	}
 
 	public function testWhenFirstNameIsMissingFromPersonalApplication_validationFails() {
 		$request = $this->newValidRequest();
-		$request->setApplicantFirstName( '' );
+		$request->setApplicantFirstName('');
 
 		$this->assertRequestValidationResultInErrors(
 			$request,
-			[ Result::SOURCE_APPLICANT_FIRST_NAME => Result::VIOLATION_MISSING ]
+			[Result::SOURCE_APPLICANT_FIRST_NAME => Result::VIOLATION_MISSING]
 		);
 	}
 
 	public function testWhenLastNameIsMissingFromPersonalApplication_validationFails() {
 		$request = $this->newValidRequest();
-		$request->setApplicantLastName( '' );
+		$request->setApplicantLastName('');
 
 		$this->assertRequestValidationResultInErrors(
 			$request,
-			[ Result::SOURCE_APPLICANT_LAST_NAME => Result::VIOLATION_MISSING ]
+			[Result::SOURCE_APPLICANT_LAST_NAME => Result::VIOLATION_MISSING]
 		);
 	}
 
 	public function testWhenSalutationIsMissingFromPersonalApplication_validationFails() {
 		$request = $this->newValidRequest();
-		$request->setApplicantSalutation( '' );
+		$request->setApplicantSalutation('');
 
 		$this->assertRequestValidationResultInErrors(
 			$request,
-			[ Result::SOURCE_APPLICANT_SALUTATION => Result::VIOLATION_MISSING ]
+			[Result::SOURCE_APPLICANT_SALUTATION => Result::VIOLATION_MISSING]
 		);
 	}
 
 	public function testWhenStreetAddressIsMissing_validationFails() {
 		$request = $this->newValidRequest();
-		$request->setApplicantStreetAddress( '' );
+		$request->setApplicantStreetAddress('');
 
 		$this->assertRequestValidationResultInErrors(
 			$request,
-			[ Result::SOURCE_APPLICANT_STREET_ADDRESS => Result::VIOLATION_MISSING ]
+			[Result::SOURCE_APPLICANT_STREET_ADDRESS => Result::VIOLATION_MISSING]
 		);
 	}
 
 	public function testWhenPostalCodeIsMissing_validationFails() {
 		$request = $this->newValidRequest();
-		$request->setApplicantPostalCode( '' );
+		$request->setApplicantPostalCode('');
 
 		$this->assertRequestValidationResultInErrors(
 			$request,
-			[ Result::SOURCE_APPLICANT_POSTAL_CODE => Result::VIOLATION_MISSING ]
+			[Result::SOURCE_APPLICANT_POSTAL_CODE => Result::VIOLATION_MISSING]
 		);
 	}
 
 	public function testWhenCityIsMissing_validationFails() {
 		$request = $this->newValidRequest();
-		$request->setApplicantCity( '' );
+		$request->setApplicantCity('');
 
 		$this->assertRequestValidationResultInErrors(
 			$request,
-			[ Result::SOURCE_APPLICANT_CITY => Result::VIOLATION_MISSING ]
+			[Result::SOURCE_APPLICANT_CITY => Result::VIOLATION_MISSING]
 		);
 	}
 
 	public function testWhenCountryCodeIsMissing_validationFails() {
 		$request = $this->newValidRequest();
-		$request->setApplicantCountryCode( '' );
+		$request->setApplicantCountryCode('');
 
 		$this->assertRequestValidationResultInErrors(
 			$request,
-			[ Result::SOURCE_APPLICANT_COUNTRY => Result::VIOLATION_MISSING ]
+			[Result::SOURCE_APPLICANT_COUNTRY => Result::VIOLATION_MISSING]
 		);
 	}
 
 	public function testPhoneNumberIsNotProvided_validationDoesNotFail() {
 		$request = $this->newValidRequest();
-		$request->setApplicantPhoneNumber( '' );
+		$request->setApplicantPhoneNumber('');
 
-		$this->assertTrue( $this->newValidator()->validate( $request )->isSuccessful() );
+		$this->assertTrue($this->newValidator()->validate($request)->isSuccessful());
 	}
 
 	public function testDateOfBirthIsNotProvided_validationDoesNotFail() {
 		$request = $this->newValidRequest();
-		$request->setApplicantDateOfBirth( '' );
+		$request->setApplicantDateOfBirth('');
 
-		$this->assertTrue( $this->newValidator()->validate( $request )->isSuccessful() );
+		$this->assertTrue($this->newValidator()->validate($request)->isSuccessful());
 	}
 
 	public function testPersonalInfoWithLongFields_validationFails() {
-		$longText = str_repeat( 'Cats ', 500 );
+		$longText = str_repeat('Cats ', 500);
 		$request = $this->newValidRequest();
-		$request->setApplicantFirstName( $longText );
-		$request->setApplicantLastName( $longText );
-		$request->setApplicantTitle( $longText );
-		$request->setApplicantSalutation( $longText );
-		$request->setApplicantStreetAddress( $longText );
-		$request->setApplicantPostalCode( $longText );
-		$request->setApplicantCity( $longText );
-		$request->setApplicantCountryCode( $longText );
+		$request->setApplicantFirstName($longText);
+		$request->setApplicantLastName($longText);
+		$request->setApplicantTitle($longText);
+		$request->setApplicantSalutation($longText);
+		$request->setApplicantStreetAddress($longText);
+		$request->setApplicantPostalCode($longText);
+		$request->setApplicantCity($longText);
+		$request->setApplicantCountryCode($longText);
 		$this->assertRequestValidationResultInErrors(
 			$request,
 			[
@@ -411,8 +411,8 @@ 
 
 	public function testContactInfoWithLongFields_validationFails() {
 		$request = $this->newValidRequest();
-		$request->setApplicantEmailAddress( str_repeat( 'Cats', 500 ) . '@example.com' );
-		$request->setApplicantPhoneNumber( str_repeat( '1234', 500 ) );
+		$request->setApplicantEmailAddress(str_repeat('Cats', 500) . '@example.com');
+		$request->setApplicantPhoneNumber(str_repeat('1234', 500));
 
 		$this->assertRequestValidationResultInErrors(
 			$request,
@@ -424,11 +424,11 @@ 
 	}
 
 	public function testBankDataWithLongFields_validationFails() {
-		$longText = str_repeat( 'Cats ', 500 );
+		$longText = str_repeat('Cats ', 500);
 		$request = $this->newValidRequest();
 		$bankData = $request->getBankData();
-		$bankData->setBic( $longText );
-		$bankData->setBankName( $longText );
+		$bankData->setBic($longText);
+		$bankData->setBankName($longText);
 		// Other length violations will be caught by IBAN validation
 
 		$this->assertRequestValidationResultInErrors(
@@ -442,17 +442,17 @@ 
 
 	public function testGivenValidRequestUsingPayPal_validationSucceeds() {
 		$validRequest = $this->newValidRequestUsingPayPal();
-		$response = $this->newValidator()->validate( $validRequest );
+		$response = $this->newValidator()->validate($validRequest);
 
-		$this->assertEquals( new Result(), $response );
-		$this->assertEmpty( $response->getViolationSources() );
-		$this->assertTrue( $response->isSuccessful() );
+		$this->assertEquals(new Result(), $response);
+		$this->assertEmpty($response->getViolationSources());
+		$this->assertTrue($response->isSuccessful());
 	}
 
 	private function newValidRequestUsingPayPal(): ApplyForMembershipRequest {
 		$request = ValidMembershipApplicationRequest::newValidRequest();
-		$request->setPaymentType( ValidMembershipApplication::PAYMENT_TYPE_PAYPAL );
-		$request->setBankData( new BankData() );
+		$request->setPaymentType(ValidMembershipApplication::PAYMENT_TYPE_PAYPAL);
+		$request->setBankData(new BankData());
 		return $request;
 	}
 

contexts/DonationContext/tests/Integration/UseCases/AddDonation/AddDonationValidatorTest.php

Spacing +91 added lines, -91 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types = 1);
 
 namespace WMDE\Fundraising\Frontend\DonationContext\Tests\Integration\UseCases\AddDonation;
 
@@ -39,182 +39,182 @@ 
 
 	public function testGivenValidDonation_validationIsSuccessful() {
 		$request = ValidAddDonationRequest::getRequest();
-		$this->assertEmpty( $this->donationValidator->validate( $request )->getViolations() );
+		$this->assertEmpty($this->donationValidator->validate($request)->getViolations());
 	}
 
 	public function testGivenAnonymousDonorAndEmptyAddressFields_validatorReturnsNoViolations() {
 		$request = ValidAddDonationRequest::getRequest();
 
-		$request->setDonorType( DonorName::PERSON_ANONYMOUS );
-		$request->setDonorSalutation( '' );
-		$request->setDonorTitle( '' );
-		$request->setDonorCompany( '' );
-		$request->setDonorFirstName( '' );
-		$request->setDonorLastName( '' );
-		$request->setDonorStreetAddress( '' );
-		$request->setDonorPostalCode( '' );
-		$request->setDonorCity( '' );
-		$request->setDonorCountryCode( '' );
-		$request->setDonorEmailAddress( '' );
-
-		$this->assertEmpty( $this->donationValidator->validate( $request )->getViolations() );
+		$request->setDonorType(DonorName::PERSON_ANONYMOUS);
+		$request->setDonorSalutation('');
+		$request->setDonorTitle('');
+		$request->setDonorCompany('');
+		$request->setDonorFirstName('');
+		$request->setDonorLastName('');
+		$request->setDonorStreetAddress('');
+		$request->setDonorPostalCode('');
+		$request->setDonorCity('');
+		$request->setDonorCountryCode('');
+		$request->setDonorEmailAddress('');
+
+		$this->assertEmpty($this->donationValidator->validate($request)->getViolations());
 	}
 
 	public function testGivenNoPaymentType_validatorReturnsFalse() {
 		$request = ValidAddDonationRequest::getRequest();
-		$request->setPaymentType( '' );
+		$request->setPaymentType('');
 
-		$this->assertFalse( $this->donationValidator->validate( $request )->isSuccessful() );
+		$this->assertFalse($this->donationValidator->validate($request)->isSuccessful());
 
 		$this->assertConstraintWasViolated(
-			$this->donationValidator->validate( $request ),
+			$this->donationValidator->validate($request),
 			AddDonationValidationResult::SOURCE_PAYMENT_TYPE
 		);
 	}
 
 	public function testGivenUnsupportedPaymentType_validatorReturnsFalse() {
 		$request = ValidAddDonationRequest::getRequest();
-		$request->setPaymentType( 'KaiCoin' );
+		$request->setPaymentType('KaiCoin');
 
-		$this->assertFalse( $this->donationValidator->validate( $request )->isSuccessful() );
+		$this->assertFalse($this->donationValidator->validate($request)->isSuccessful());
 
 		$this->assertConstraintWasViolated(
-			$this->donationValidator->validate( $request ),
+			$this->donationValidator->validate($request),
 			AddDonationValidationResult::SOURCE_PAYMENT_TYPE
 		);
 	}
 
 	public function testPersonalInfoValidationFails_validatorReturnsFalse() {
 		$request = ValidAddDonationRequest::getRequest();
-		$request->setDonorType( DonorName::PERSON_COMPANY );
-		$request->setDonorCompany( '' );
+		$request->setDonorType(DonorName::PERSON_COMPANY);
+		$request->setDonorCompany('');
 
-		$this->assertFalse( $this->donationValidator->validate( $request )->isSuccessful() );
+		$this->assertFalse($this->donationValidator->validate($request)->isSuccessful());
 
 		$this->assertConstraintWasViolated(
-			$this->donationValidator->validate( $request ),
+			$this->donationValidator->validate($request),
 			AddDonationValidationResult::SOURCE_DONOR_COMPANY
 		);
 	}
 
 	public function testDirectDebitMissingBankData_validatorReturnsFalse() {
 		$bankData = new BankData();
-		$bankData->setIban( new Iban( '' ) );
-		$bankData->setBic( '' );
-		$bankData->setBankName( '' );
+		$bankData->setIban(new Iban(''));
+		$bankData->setBic('');
+		$bankData->setBankName('');
 		$request = ValidAddDonationRequest::getRequest();
-		$request->setBankData( $bankData );
+		$request->setBankData($bankData);
 
-		$result = $this->donationValidator->validate( $request );
-		$this->assertFalse( $result->isSuccessful() );
+		$result = $this->donationValidator->validate($request);
+		$this->assertFalse($result->isSuccessful());
 
-		$this->assertConstraintWasViolated( $result, AddDonationValidationResult::SOURCE_IBAN );
-		$this->assertConstraintWasViolated( $result, AddDonationValidationResult::SOURCE_BIC );
+		$this->assertConstraintWasViolated($result, AddDonationValidationResult::SOURCE_IBAN);
+		$this->assertConstraintWasViolated($result, AddDonationValidationResult::SOURCE_BIC);
 	}
 
 	public function testForeignDirectDebitMissingBankData_validationSucceeds() {
 		$bankData = new BankData();
-		$bankData->setIban( new Iban( self::FOREIGN_IBAN ) );
-		$bankData->setBic( self::FOREIGN_BIC );
-		$bankData->setBankName( '' );
-		$bankData->setAccount( '' );
-		$bankData->setBankCode( '' );
+		$bankData->setIban(new Iban(self::FOREIGN_IBAN));
+		$bankData->setBic(self::FOREIGN_BIC);
+		$bankData->setBankName('');
+		$bankData->setAccount('');
+		$bankData->setBankCode('');
 
 		$request = ValidAddDonationRequest::getRequest();
-		$request->setBankData( $bankData );
+		$request->setBankData($bankData);
 
-		$result = $this->donationValidator->validate( $request );
-		$this->assertTrue( $result->isSuccessful() );
-		$this->assertFalse( $result->hasViolations() );
+		$result = $this->donationValidator->validate($request);
+		$this->assertTrue($result->isSuccessful());
+		$this->assertFalse($result->hasViolations());
 	}
 
 	public function testAmountTooLow_validatorReturnsFalse() {
 		$request = ValidAddDonationRequest::getRequest();
-		$request->setAmount( Euro::newFromCents( 50 ) );
+		$request->setAmount(Euro::newFromCents(50));
 
-		$result = $this->donationValidator->validate( $request );
-		$this->assertFalse( $result->isSuccessful() );
+		$result = $this->donationValidator->validate($request);
+		$this->assertFalse($result->isSuccessful());
 
-		$this->assertConstraintWasViolated( $result, AddDonationValidationResult::SOURCE_PAYMENT_AMOUNT );
+		$this->assertConstraintWasViolated($result, AddDonationValidationResult::SOURCE_PAYMENT_AMOUNT);
 	}
 
 	public function testPersonalInfoWithLongFields_validationFails() {
-		$longText = str_repeat( 'Cats ', 500 );
+		$longText = str_repeat('Cats ', 500);
 		$request = ValidAddDonationRequest::getRequest();
-		$request->setDonorFirstName( $longText );
-		$request->setDonorLastName( $longText );
-		$request->setDonorTitle( $longText );
-		$request->setDonorSalutation( $longText );
-		$request->setDonorStreetAddress( $longText );
-		$request->setDonorPostalCode( $longText );
-		$request->setDonorCity( $longText );
-		$request->setDonorCountryCode( $longText );
-		$request->setDonorEmailAddress( str_repeat( 'Cats', 500 ) . '@example.com' );
-
-		$result = $this->donationValidator->validate( $request );
-		$this->assertFalse( $result->isSuccessful() );
-
-		$this->assertConstraintWasViolated( $result, AddDonationValidationResult::SOURCE_DONOR_FIRST_NAME );
-		$this->assertConstraintWasViolated( $result, AddDonationValidationResult::SOURCE_DONOR_LAST_NAME );
-		$this->assertConstraintWasViolated( $result, AddDonationValidationResult::SOURCE_DONOR_SALUTATION );
-		$this->assertConstraintWasViolated( $result, AddDonationValidationResult::SOURCE_DONOR_TITLE );
-		$this->assertConstraintWasViolated( $result, AddDonationValidationResult::SOURCE_DONOR_STREET_ADDRESS );
-		$this->assertConstraintWasViolated( $result, AddDonationValidationResult::SOURCE_DONOR_CITY );
-		$this->assertConstraintWasViolated( $result, AddDonationValidationResult::SOURCE_DONOR_POSTAL_CODE );
-		$this->assertConstraintWasViolated( $result, AddDonationValidationResult::SOURCE_DONOR_COUNTRY );
-		$this->assertConstraintWasViolated( $result, AddDonationValidationResult::SOURCE_DONOR_EMAIL );
+		$request->setDonorFirstName($longText);
+		$request->setDonorLastName($longText);
+		$request->setDonorTitle($longText);
+		$request->setDonorSalutation($longText);
+		$request->setDonorStreetAddress($longText);
+		$request->setDonorPostalCode($longText);
+		$request->setDonorCity($longText);
+		$request->setDonorCountryCode($longText);
+		$request->setDonorEmailAddress(str_repeat('Cats', 500) . '@example.com');
+
+		$result = $this->donationValidator->validate($request);
+		$this->assertFalse($result->isSuccessful());
+
+		$this->assertConstraintWasViolated($result, AddDonationValidationResult::SOURCE_DONOR_FIRST_NAME);
+		$this->assertConstraintWasViolated($result, AddDonationValidationResult::SOURCE_DONOR_LAST_NAME);
+		$this->assertConstraintWasViolated($result, AddDonationValidationResult::SOURCE_DONOR_SALUTATION);
+		$this->assertConstraintWasViolated($result, AddDonationValidationResult::SOURCE_DONOR_TITLE);
+		$this->assertConstraintWasViolated($result, AddDonationValidationResult::SOURCE_DONOR_STREET_ADDRESS);
+		$this->assertConstraintWasViolated($result, AddDonationValidationResult::SOURCE_DONOR_CITY);
+		$this->assertConstraintWasViolated($result, AddDonationValidationResult::SOURCE_DONOR_POSTAL_CODE);
+		$this->assertConstraintWasViolated($result, AddDonationValidationResult::SOURCE_DONOR_COUNTRY);
+		$this->assertConstraintWasViolated($result, AddDonationValidationResult::SOURCE_DONOR_EMAIL);
 	}
 
 	public function testBankDataWithLongFields_validationFails() {
-		$longText = str_repeat( 'Cats ', 500 );
+		$longText = str_repeat('Cats ', 500);
 		$request = ValidAddDonationRequest::getRequest();
 		$validBankData = $request->getBankData();
 		$bankData = new BankData();
-		$bankData->setBic( $longText );
-		$bankData->setBankName( $longText );
+		$bankData->setBic($longText);
+		$bankData->setBankName($longText);
 		// Other length violations will be caught by IBAN validation
-		$bankData->setIban( $validBankData->getIban() );
-		$bankData->setAccount( $validBankData->getAccount() );
-		$bankData->setBankCode( $validBankData->getBankCode() );
+		$bankData->setIban($validBankData->getIban());
+		$bankData->setAccount($validBankData->getAccount());
+		$bankData->setBankCode($validBankData->getBankCode());
 		$bankData->freeze();
-		$request->setBankData( $bankData );
+		$request->setBankData($bankData);
 
-		$result = $this->donationValidator->validate( $request );
-		$this->assertFalse( $result->isSuccessful() );
+		$result = $this->donationValidator->validate($request);
+		$this->assertFalse($result->isSuccessful());
 
-		$this->assertConstraintWasViolated( $result, AddDonationValidationResult::SOURCE_BANK_NAME );
-		$this->assertConstraintWasViolated( $result, AddDonationValidationResult::SOURCE_BIC );
+		$this->assertConstraintWasViolated($result, AddDonationValidationResult::SOURCE_BANK_NAME);
+		$this->assertConstraintWasViolated($result, AddDonationValidationResult::SOURCE_BIC);
 	}
 
 	public function testLongSource_validationFails() {
 		$request = ValidAddDonationRequest::getRequest();
-		$request->setSource( 'http://catlady.com/#' . str_repeat( 'Cats ', 500 ) );
+		$request->setSource('http://catlady.com/#' . str_repeat('Cats ', 500));
 
-		$result = $this->donationValidator->validate( $request );
-		$this->assertFalse( $result->isSuccessful() );
+		$result = $this->donationValidator->validate($request);
+		$this->assertFalse($result->isSuccessful());
 
-		$this->assertConstraintWasViolated( $result, AddDonationValidationResult::SOURCE_TRACKING_SOURCE );
+		$this->assertConstraintWasViolated($result, AddDonationValidationResult::SOURCE_TRACKING_SOURCE);
 	}
 
 	private function newDonationValidator(): AddDonationValidator {
 		return new AddDonationValidator(
-			new PaymentDataValidator( 1.0, 100000 ),
+			new PaymentDataValidator(1.0, 100000),
 			$this->newBankDataValidator(),
 			$this->newMockEmailValidator()
 		);
 	}
 
 	private function newBankDataValidator(): BankDataValidator {
-		$ibanValidatorMock = $this->getMockBuilder( IbanValidator::class )->disableOriginalConstructor()->getMock();
-		$ibanValidatorMock->method( 'validate' )
-			->willReturn( new ValidationResult() );
+		$ibanValidatorMock = $this->getMockBuilder(IbanValidator::class)->disableOriginalConstructor()->getMock();
+		$ibanValidatorMock->method('validate')
+			->willReturn(new ValidationResult());
 
-		return new BankDataValidator( $ibanValidatorMock );
+		return new BankDataValidator($ibanValidatorMock);
 	}
 
 	private function newMockEmailValidator() {
-		$validator = $this->getMockBuilder( EmailValidator::class )->disableOriginalConstructor()->getMock();
-		$validator->method( 'validate' )->willReturn( new ValidationResult() );
+		$validator = $this->getMockBuilder(EmailValidator::class)->disableOriginalConstructor()->getMock();
+		$validator->method('validate')->willReturn(new ValidationResult());
 		return $validator;
 	}
 }

tests/EdgeToEdge/Routes/AddDonationRouteTest.php

Spacing +204 added lines, -204 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types = 1);
 
 namespace WMDE\Fundraising\Frontend\Tests\EdgeToEdge\Routes;
 
@@ -23,17 +23,17 @@ 
 	const SOME_TOKEN = 'SomeToken';
 
 	public function setUp() {
-		if ( !function_exists( 'lut_init' ) ) {
-			$this->markTestSkipped( 'The konto_check needs to be installed!' );
+		if (!function_exists('lut_init')) {
+			$this->markTestSkipped('The konto_check needs to be installed!');
 		}
 		parent::setUp();
 	}
 
 	public function testGivenValidRequest_donationGetsPersisted() {
-		$this->createEnvironment( [], function ( Client $client, FunFunFactory $factory ) {
+		$this->createEnvironment([], function(Client $client, FunFunFactory $factory) {
 
-			$client->setServerParameter( 'HTTP_REFERER', 'https://en.wikipedia.org/wiki/Karla_Kennichnich' );
-			$client->followRedirects( false );
+			$client->setServerParameter('HTTP_REFERER', 'https://en.wikipedia.org/wiki/Karla_Kennichnich');
+			$client->followRedirects(false);
 
 			$client->request(
 				'POST',
@@ -41,31 +41,31 @@ 
 				$this->newValidFormInput()
 			);
 
-			$this->assertIsExpectedDonation( $this->getDonationFromDatabase( $factory ) );
+			$this->assertIsExpectedDonation($this->getDonationFromDatabase($factory));
 		} );
 	}
 
 	public function testWhenDonationGetsPersisted_timestampIsStoredInCookie() {
-		$this->createEnvironment( [], function ( Client $client, FunFunFactory $factory ) {
+		$this->createEnvironment([], function(Client $client, FunFunFactory $factory) {
 
-			$client->followRedirects( true );
+			$client->followRedirects(true);
 			$client->request(
 				'POST',
 				'/donation/add',
 				$this->newValidFormInput()
 			);
 
-			$cookie = $client->getCookieJar()->get( 'donation_timestamp' );
-			$this->assertNotNull( $cookie );
-			$donationTimestamp = new \DateTime( $cookie->getValue() );
-			$this->assertEquals( time(), $donationTimestamp->getTimestamp(), 'Timestamp should be not more than 5 seconds old', 5.0 );
+			$cookie = $client->getCookieJar()->get('donation_timestamp');
+			$this->assertNotNull($cookie);
+			$donationTimestamp = new \DateTime($cookie->getValue());
+			$this->assertEquals(time(), $donationTimestamp->getTimestamp(), 'Timestamp should be not more than 5 seconds old', 5.0);
 
 		} );
 	}
 
 	public function testWhenMultipleDonationFormSubmissions_requestGetsRejected() {
-		$this->createEnvironment( [], function ( Client $client, FunFunFactory $factory ) {
-			$client->getCookieJar()->set( new Cookie( 'donation_timestamp', $this->getPastTimestamp() ) );
+		$this->createEnvironment([], function(Client $client, FunFunFactory $factory) {
+			$client->getCookieJar()->set(new Cookie('donation_timestamp', $this->getPastTimestamp()));
 
 			$client->request(
 				'POST',
@@ -73,16 +73,16 @@ 
 				$this->newValidFormInput()
 			);
 
-			$this->assertContains( 'Sie haben vor sehr kurzer Zeit bereits gespendet', $client->getResponse()->getContent() );
+			$this->assertContains('Sie haben vor sehr kurzer Zeit bereits gespendet', $client->getResponse()->getContent());
 		} );
 	}
 
 	public function testWhenMultipleDonationsInAccordanceToTimeLimit_requestIsNotRejected() {
-		$this->createEnvironment( [], function ( Client $client, FunFunFactory $factory ) {
+		$this->createEnvironment([], function(Client $client, FunFunFactory $factory) {
 			$client->getCookieJar()->set(
 				new Cookie(
 					'donation_timestamp',
-					$this->getPastTimestamp( 'PT35M' )
+					$this->getPastTimestamp('PT35M')
 				)
 			);
 
@@ -92,12 +92,12 @@ 
 				$this->newValidFormInput()
 			);
 
-			$this->assertNotContains( 'Sie haben vor sehr kurzer Zeit bereits gespendet', $client->getResponse()->getContent() );
+			$this->assertNotContains('Sie haben vor sehr kurzer Zeit bereits gespendet', $client->getResponse()->getContent());
 		} );
 	}
 
-	private function getPastTimestamp( string $interval = 'PT10S' ) {
-		return ( new \DateTime() )->sub( new \DateInterval( $interval ) )->format( 'Y-m-d H:i:s' );
+	private function getPastTimestamp(string $interval = 'PT10S') {
+		return (new \DateTime())->sub(new \DateInterval($interval))->format('Y-m-d H:i:s');
 	}
 
 	private function newValidFormInput() {
@@ -132,43 +132,43 @@ 
 		];
 	}
 
-	private function assertIsExpectedDonation( Donation $donation ) {
+	private function assertIsExpectedDonation(Donation $donation) {
 		$data = $donation->getDecodedData();
-		$this->assertSame( '5.51', $donation->getAmount() );
-		$this->assertSame( 'BEZ', $donation->getPaymentType() );
-		$this->assertSame( 0, $donation->getPaymentIntervalInMonths() );
-		$this->assertSame( 'DE12500105170648489890', $data['iban'] );
-		$this->assertSame( 'INGDDEFFXXX', $data['bic'] );
-		$this->assertSame( '0648489890', $data['konto'] );
-		$this->assertSame( '50010517', $data['blz'] );
-		$this->assertSame( 'ING-DiBa', $data['bankname'] );
-		$this->assertSame( 'person', $data['adresstyp'] );
-		$this->assertSame( 'Frau', $data['anrede'] );
-		$this->assertSame( 'Prof. Dr.', $data['titel'] );
-		$this->assertSame( '', $data['firma'] );
-		$this->assertSame( 'Karla', $data['vorname'] );
-		$this->assertSame( 'Kennichnich', $data['nachname'] );
-		$this->assertSame( 'Prof. Dr. Karla Kennichnich', $donation->getDonorFullName() );
-		$this->assertSame( 'Lehmgasse 12', $data['strasse'] );
-		$this->assertSame( '12345', $data['plz'] );
-		$this->assertSame( 'Einort', $data['ort'] );
-		$this->assertSame( 'Einort', $donation->getDonorCity() );
-		$this->assertSame( 'DE', $data['country'] );
-		$this->assertSame( 'karla@kennichnich.de', $data['email'] );
-		$this->assertSame( 'karla@kennichnich.de', $donation->getDonorEmail() );
-		$this->assertSame( 'test/gelb', $data['tracking'] );
-		$this->assertSame( 3, $data['impCount'] );
-		$this->assertSame( 1, $data['bImpCount'] );
-		$this->assertSame( '', $data['layout'] );
-		$this->assertSame( '', $data['color'] );
-		$this->assertSame( '', $data['skin'] );
-		$this->assertSame( 'en.wikipedia.org', $data['source'] );
-		$this->assertSame( 'N', $donation->getStatus() );
-		$this->assertTrue( $donation->getDonorOptsIntoNewsletter() );
+		$this->assertSame('5.51', $donation->getAmount());
+		$this->assertSame('BEZ', $donation->getPaymentType());
+		$this->assertSame(0, $donation->getPaymentIntervalInMonths());
+		$this->assertSame('DE12500105170648489890', $data['iban']);
+		$this->assertSame('INGDDEFFXXX', $data['bic']);
+		$this->assertSame('0648489890', $data['konto']);
+		$this->assertSame('50010517', $data['blz']);
+		$this->assertSame('ING-DiBa', $data['bankname']);
+		$this->assertSame('person', $data['adresstyp']);
+		$this->assertSame('Frau', $data['anrede']);
+		$this->assertSame('Prof. Dr.', $data['titel']);
+		$this->assertSame('', $data['firma']);
+		$this->assertSame('Karla', $data['vorname']);
+		$this->assertSame('Kennichnich', $data['nachname']);
+		$this->assertSame('Prof. Dr. Karla Kennichnich', $donation->getDonorFullName());
+		$this->assertSame('Lehmgasse 12', $data['strasse']);
+		$this->assertSame('12345', $data['plz']);
+		$this->assertSame('Einort', $data['ort']);
+		$this->assertSame('Einort', $donation->getDonorCity());
+		$this->assertSame('DE', $data['country']);
+		$this->assertSame('karla@kennichnich.de', $data['email']);
+		$this->assertSame('karla@kennichnich.de', $donation->getDonorEmail());
+		$this->assertSame('test/gelb', $data['tracking']);
+		$this->assertSame(3, $data['impCount']);
+		$this->assertSame(1, $data['bImpCount']);
+		$this->assertSame('', $data['layout']);
+		$this->assertSame('', $data['color']);
+		$this->assertSame('', $data['skin']);
+		$this->assertSame('en.wikipedia.org', $data['source']);
+		$this->assertSame('N', $donation->getStatus());
+		$this->assertTrue($donation->getDonorOptsIntoNewsletter());
 	}
 
 	public function testGivenValidRequest_confirmationPageContainsEnteredData() {
-		$this->createEnvironment( [], function ( Client $client, FunFunFactory $factory ) {
+		$this->createEnvironment([], function(Client $client, FunFunFactory $factory) {
 
 			$client->request(
 				'POST',
@@ -179,17 +179,17 @@ 
 
 			$response = $client->getResponse()->getContent();
 
-			$this->assertContains( '<strong>5,51 €</strong>', $response );
-			$this->assertContains( 'per Lastschrift', $response );
-			$this->assertContains( 'einmalig', $response );
-			$this->assertContains( 'DE12500105170648489890', $response );
-			$this->assertContains( 'INGDDEFFXXX', $response );
-			$this->assertContains( 'ING-DiBa', $response );
-			$this->assertContains( 'Prof. Dr. Karla Kennichnich', $response );
-			$this->assertContains( 'Lehmgasse 12', $response );
-			$this->assertContains( '<span id="confirm-postcode">12345</span> <span id="confirm-city">Einort</span>', $response );
-			$this->assertContains( 'karla@kennichnich.de', $response );
-			$this->assertContains( '<div id="send-info"', $response );
+			$this->assertContains('<strong>5,51 €</strong>', $response);
+			$this->assertContains('per Lastschrift', $response);
+			$this->assertContains('einmalig', $response);
+			$this->assertContains('DE12500105170648489890', $response);
+			$this->assertContains('INGDDEFFXXX', $response);
+			$this->assertContains('ING-DiBa', $response);
+			$this->assertContains('Prof. Dr. Karla Kennichnich', $response);
+			$this->assertContains('Lehmgasse 12', $response);
+			$this->assertContains('<span id="confirm-postcode">12345</span> <span id="confirm-city">Einort</span>', $response);
+			$this->assertContains('karla@kennichnich.de', $response);
+			$this->assertContains('<div id="send-info"', $response);
 		} );
 	}
 
@@ -199,10 +199,10 @@ 
 		 */
 		$factory = null;
 
-		$this->createEnvironment( [], function ( Client $client, FunFunFactory $factory ) {
+		$this->createEnvironment([], function(Client $client, FunFunFactory $factory) {
 
-			$client->setServerParameter( 'HTTP_REFERER', 'https://en.wikipedia.org/wiki/Karla_Kennichnich' );
-			$client->followRedirects( false );
+			$client->setServerParameter('HTTP_REFERER', 'https://en.wikipedia.org/wiki/Karla_Kennichnich');
+			$client->followRedirects(false);
 
 			$client->request(
 				'POST',
@@ -210,37 +210,37 @@ 
 				$this->newValidBankTransferInput()
 			);
 
-			$donation = $this->getDonationFromDatabase( $factory );
+			$donation = $this->getDonationFromDatabase($factory);
 
 			$data = $donation->getDecodedData();
-			$this->assertSame( '12.34', $donation->getAmount() );
-			$this->assertSame( 'UEB', $donation->getPaymentType() );
-			$this->assertSame( 0, $donation->getPaymentIntervalInMonths() );
-			$this->assertSame( 'person', $data['adresstyp'] );
-			$this->assertSame( 'Frau', $data['anrede'] );
-			$this->assertSame( 'Prof. Dr.', $data['titel'] );
-			$this->assertSame( '', $data['firma'] );
-			$this->assertSame( 'Karla', $data['vorname'] );
-			$this->assertSame( 'Kennichnich', $data['nachname'] );
-			$this->assertSame( 'Prof. Dr. Karla Kennichnich', $donation->getDonorFullName() );
-			$this->assertSame( 'Lehmgasse 12', $data['strasse'] );
-			$this->assertSame( '12345', $data['plz'] );
-			$this->assertSame( 'Einort', $data['ort'] );
-			$this->assertSame( 'Einort', $donation->getDonorCity() );
-			$this->assertSame( 'DE', $data['country'] );
-			$this->assertSame( 'karla@kennichnich.de', $data['email'] );
-			$this->assertSame( 'karla@kennichnich.de', $donation->getDonorEmail() );
-			$this->assertSame( 'test/gelb', $data['tracking'] );
-			$this->assertSame( 3, $data['impCount'] );
-			$this->assertSame( 1, $data['bImpCount'] );
-			$this->assertSame( '', $data['layout'] );
-			$this->assertSame( '', $data['color'] );
-			$this->assertSame( '', $data['skin'] );
-			$this->assertSame( 'en.wikipedia.org', $data['source'] );
-			$this->assertSame( true, $donation->getDonorOptsIntoNewsletter() );
-
-			$this->assertSame( 'Z', $donation->getStatus() );
-			$this->assertRegExp( '/W-Q-[A-Z]{6}-[A-Z]/', $donation->getBankTransferCode() );
+			$this->assertSame('12.34', $donation->getAmount());
+			$this->assertSame('UEB', $donation->getPaymentType());
+			$this->assertSame(0, $donation->getPaymentIntervalInMonths());
+			$this->assertSame('person', $data['adresstyp']);
+			$this->assertSame('Frau', $data['anrede']);
+			$this->assertSame('Prof. Dr.', $data['titel']);
+			$this->assertSame('', $data['firma']);
+			$this->assertSame('Karla', $data['vorname']);
+			$this->assertSame('Kennichnich', $data['nachname']);
+			$this->assertSame('Prof. Dr. Karla Kennichnich', $donation->getDonorFullName());
+			$this->assertSame('Lehmgasse 12', $data['strasse']);
+			$this->assertSame('12345', $data['plz']);
+			$this->assertSame('Einort', $data['ort']);
+			$this->assertSame('Einort', $donation->getDonorCity());
+			$this->assertSame('DE', $data['country']);
+			$this->assertSame('karla@kennichnich.de', $data['email']);
+			$this->assertSame('karla@kennichnich.de', $donation->getDonorEmail());
+			$this->assertSame('test/gelb', $data['tracking']);
+			$this->assertSame(3, $data['impCount']);
+			$this->assertSame(1, $data['bImpCount']);
+			$this->assertSame('', $data['layout']);
+			$this->assertSame('', $data['color']);
+			$this->assertSame('', $data['skin']);
+			$this->assertSame('en.wikipedia.org', $data['source']);
+			$this->assertSame(true, $donation->getDonorOptsIntoNewsletter());
+
+			$this->assertSame('Z', $donation->getStatus());
+			$this->assertRegExp('/W-Q-[A-Z]{6}-[A-Z]/', $donation->getBankTransferCode());
 		} );
 	}
 
@@ -272,10 +272,10 @@ 
 	}
 
 	public function testGivenComplementableBankData_donationStillGetsPersisted() {
-		$this->createEnvironment( [], function ( Client $client, FunFunFactory $factory ) {
+		$this->createEnvironment([], function(Client $client, FunFunFactory $factory) {
 
-			$client->setServerParameter( 'HTTP_REFERER', 'https://en.wikipedia.org/wiki/Karla_Kennichnich' );
-			$client->followRedirects( false );
+			$client->setServerParameter('HTTP_REFERER', 'https://en.wikipedia.org/wiki/Karla_Kennichnich');
+			$client->followRedirects(false);
 
 			$client->request(
 				'POST',
@@ -283,14 +283,14 @@ 
 				$this->newComplementableFormInput()
 			);
 
-			$donation = $this->getDonationFromDatabase( $factory );
+			$donation = $this->getDonationFromDatabase($factory);
 
 			$data = $donation->getDecodedData();
-			$this->assertSame( 'DE12500105170648489890', $data['iban'] );
-			$this->assertSame( 'INGDDEFFXXX', $data['bic'] );
-			$this->assertSame( '0648489890', $data['konto'] );
-			$this->assertSame( '50010517', $data['blz'] );
-			$this->assertSame( 'ING-DiBa', $data['bankname'] );
+			$this->assertSame('DE12500105170648489890', $data['iban']);
+			$this->assertSame('INGDDEFFXXX', $data['bic']);
+			$this->assertSame('0648489890', $data['konto']);
+			$this->assertSame('50010517', $data['blz']);
+			$this->assertSame('ING-DiBa', $data['bankname']);
 		} );
 	}
 
@@ -313,16 +313,16 @@ 
 		];
 	}
 
-	private function getDonationFromDatabase( FunFunFactory $factory ): Donation {
-		$donationRepo = $factory->getEntityManager()->getRepository( Donation::class );
-		$donation = $donationRepo->find( 1 );
-		$this->assertInstanceOf( Donation::class, $donation );
+	private function getDonationFromDatabase(FunFunFactory $factory): Donation {
+		$donationRepo = $factory->getEntityManager()->getRepository(Donation::class);
+		$donation = $donationRepo->find(1);
+		$this->assertInstanceOf(Donation::class, $donation);
 		return $donation;
 	}
 
 	public function testGivenValidPayPalData_redirectsToPayPal() {
-		$this->createEnvironment( [], function ( Client $client, FunFunFactory $factory ) {
-			$client->followRedirects( false );
+		$this->createEnvironment([], function(Client $client, FunFunFactory $factory) {
+			$client->followRedirects(false);
 
 			$client->request(
 				'POST',
@@ -331,8 +331,8 @@ 
 			);
 
 			$response = $client->getResponse();
-			$this->assertSame( 302, $response->getStatusCode() );
-			$this->assertContains( 'sandbox.paypal.com', $response->getContent() );
+			$this->assertSame(302, $response->getStatusCode());
+			$this->assertContains('sandbox.paypal.com', $response->getContent());
 		} );
 	}
 
@@ -346,7 +346,7 @@ 
 	}
 
 	public function testGivenValidCreditCardData_showsIframeEmbeddingPage() {
-		$this->createEnvironment( [], function ( Client $client, FunFunFactory $factory ) {
+		$this->createEnvironment([], function(Client $client, FunFunFactory $factory) {
 
 			$client->request(
 				'POST',
@@ -355,9 +355,9 @@ 
 			);
 
 			$response = $client->getResponse();
-			$this->assertSame( 200, $response->getStatusCode() );
-			$this->assertContains( 'Ich spende vierteljährlich 12,34 € per Kreditkarte.', $response->getContent() );
-			$this->assertContains( 'thatother.paymentprovider.com', $response->getContent() );
+			$this->assertSame(200, $response->getStatusCode());
+			$this->assertContains('Ich spende vierteljährlich 12,34 € per Kreditkarte.', $response->getContent());
+			$this->assertContains('thatother.paymentprovider.com', $response->getContent());
 		} );
 	}
 
@@ -371,7 +371,7 @@ 
 	}
 
 	public function testGivenInvalidRequest_formIsReloadedAndPrefilled() {
-		$this->createEnvironment( [], function ( Client $client, FunFunFactory $factory ) {
+		$this->createEnvironment([], function(Client $client, FunFunFactory $factory) {
 
 			$client->request(
 				'POST',
@@ -381,28 +381,28 @@ 
 
 			$response = $client->getResponse()->getContent();
 
-			$this->assertContains( 'Amount: 0,00', $response );
-			$this->assertContains( 'Payment type: BEZ', $response );
-			$this->assertContains( 'Interval: 3', $response );
-			$this->assertContains( 'IBAN: DE12500105170648489890', $response );
-			$this->assertContains( 'BIC: INGDDEFFXXX', $response );
-			$this->assertContains( 'Bank name: ING-DiBa', $response );
-			$this->assertContains( 'Address type: person', $response );
-			$this->assertContains( 'Salutation: Frau', $response );
-			$this->assertContains( 'Title: Prof. Dr.', $response );
-			$this->assertContains( 'Company: ', $response );
-			$this->assertContains( 'First name: Karla', $response );
-			$this->assertContains( 'Last name: Kennichnich', $response );
-			$this->assertContains( 'Street: Lehmgasse 12', $response );
-			$this->assertContains( 'Postal code: 12345', $response );
-			$this->assertContains( 'City: Einort', $response );
-			$this->assertContains( 'Country code: DE', $response );
-			$this->assertContains( 'Email address: karla@kennichnich.de', $response );
+			$this->assertContains('Amount: 0,00', $response);
+			$this->assertContains('Payment type: BEZ', $response);
+			$this->assertContains('Interval: 3', $response);
+			$this->assertContains('IBAN: DE12500105170648489890', $response);
+			$this->assertContains('BIC: INGDDEFFXXX', $response);
+			$this->assertContains('Bank name: ING-DiBa', $response);
+			$this->assertContains('Address type: person', $response);
+			$this->assertContains('Salutation: Frau', $response);
+			$this->assertContains('Title: Prof. Dr.', $response);
+			$this->assertContains('Company: ', $response);
+			$this->assertContains('First name: Karla', $response);
+			$this->assertContains('Last name: Kennichnich', $response);
+			$this->assertContains('Street: Lehmgasse 12', $response);
+			$this->assertContains('Postal code: 12345', $response);
+			$this->assertContains('City: Einort', $response);
+			$this->assertContains('Country code: DE', $response);
+			$this->assertContains('Email address: karla@kennichnich.de', $response);
 		} );
 	}
 
 	public function testGivenInvalidRequest_formStillContainsBannerTrackingData() {
-		$this->createEnvironment( [], function ( Client $client, FunFunFactory $factory ) {
+		$this->createEnvironment([], function(Client $client, FunFunFactory $factory) {
 
 			$client->request(
 				'POST',
@@ -415,13 +415,13 @@ 
 
 			$response = $client->getResponse()->getContent();
 
-			$this->assertContains( 'Impression Count: 12', $response );
-			$this->assertContains( 'Banner Impression Count: 3', $response );
+			$this->assertContains('Impression Count: 12', $response);
+			$this->assertContains('Banner Impression Count: 3', $response);
 		} );
 	}
 
 	public function testGivenNegativeDonationAmount_formIsReloadedAndPrefilledWithZero() {
-		$this->createEnvironment( [], function ( Client $client, FunFunFactory $factory ) {
+		$this->createEnvironment([], function(Client $client, FunFunFactory $factory) {
 
 			$formValues = $this->newInvalidFormInput();
 			$formValues['betrag'] = '-5,00';
@@ -434,7 +434,7 @@ 
 
 			$response = $client->getResponse()->getContent();
 
-			$this->assertContains( 'Amount: 0,00', $response );
+			$this->assertContains('Amount: 0,00', $response);
 		} );
 	}
 
@@ -471,7 +471,7 @@ 
 	}
 
 	public function testGivenInvalidAnonymousRequest_formIsReloadedAndPrefilled() {
-		$this->createEnvironment( [], function ( Client $client, FunFunFactory $factory ) {
+		$this->createEnvironment([], function(Client $client, FunFunFactory $factory) {
 
 			$client->request(
 				'POST',
@@ -481,10 +481,10 @@ 
 
 			$response = $client->getResponse()->getContent();
 
-			$this->assertContains( 'Amount: 0', $response );
-			$this->assertContains( 'Payment type: UEB', $response );
-			$this->assertContains( 'Interval: 1', $response );
-			$this->assertContains( 'Value of field "amount" violates rule: Amount too low', $response );
+			$this->assertContains('Amount: 0', $response);
+			$this->assertContains('Payment type: UEB', $response);
+			$this->assertContains('Interval: 1', $response);
+			$this->assertContains('Value of field "amount" violates rule: Amount too low', $response);
 		} );
 	}
 
@@ -498,11 +498,11 @@ 
 	}
 
 	public function testGivenValidRequest_tokensAreReturned() {
-		$this->createEnvironment( [], function ( Client $client, FunFunFactory $factory ) {
-			$factory->setTokenGenerator( new FixedTokenGenerator( self::SOME_TOKEN ) );
+		$this->createEnvironment([], function(Client $client, FunFunFactory $factory) {
+			$factory->setTokenGenerator(new FixedTokenGenerator(self::SOME_TOKEN));
 
-			$client->setServerParameter( 'HTTP_REFERER', 'https://en.wikipedia.org/wiki/Karla_Kennichnich' );
-			$client->followRedirects( false );
+			$client->setServerParameter('HTTP_REFERER', 'https://en.wikipedia.org/wiki/Karla_Kennichnich');
+			$client->followRedirects(false);
 
 			$client->request(
 				'POST',
@@ -512,14 +512,14 @@ 
 
 			$response = $client->getResponse()->getContent();
 
-			$this->assertContains( self::SOME_TOKEN, $response );
+			$this->assertContains(self::SOME_TOKEN, $response);
 		} );
 	}
 
 	public function testGivenValidRequest_clientIsRedirected() {
-		$this->createEnvironment( [], function ( Client $client, FunFunFactory $factory ) {
-			$factory->setTokenGenerator( new FixedTokenGenerator( self::SOME_TOKEN ) );
-			$client->followRedirects( false );
+		$this->createEnvironment([], function(Client $client, FunFunFactory $factory) {
+			$factory->setTokenGenerator(new FixedTokenGenerator(self::SOME_TOKEN));
+			$client->followRedirects(false);
 
 			$client->request(
 				'POST',
@@ -527,13 +527,13 @@ 
 				$this->newValidFormInput()
 			);
 
-			$this->assertTrue( $client->getResponse()->isRedirect() );
+			$this->assertTrue($client->getResponse()->isRedirect());
 		} );
 	}
 
 	public function testWhenTrackingCookieExists_valueIsPersisted() {
-		$this->createEnvironment( [], function ( Client $client, FunFunFactory $factory ) {
-			$client->getCookieJar()->set( new Cookie( 'spenden_tracking', 'test/blue' ) );
+		$this->createEnvironment([], function(Client $client, FunFunFactory $factory) {
+			$client->getCookieJar()->set(new Cookie('spenden_tracking', 'test/blue'));
 
 			$client->request(
 				'POST',
@@ -541,15 +541,15 @@ 
 				$this->newComplementableFormInput()
 			);
 
-			$donation = $this->getDonationFromDatabase( $factory );
+			$donation = $this->getDonationFromDatabase($factory);
 			$data = $donation->getDecodedData();
 
-			$this->assertSame( 'test/blue', $data['tracking'] );
+			$this->assertSame('test/blue', $data['tracking']);
 		} );
 	}
 
 	public function testWhenTrackableInputDataIsSubmitted_theyAreStoredInSession() {
-		$this->createAppEnvironment( [], function ( Client $client, FunFunFactory $factory, Application $app ) {
+		$this->createAppEnvironment([], function(Client $client, FunFunFactory $factory, Application $app) {
 
 			$client->request(
 				'GET',
@@ -561,15 +561,15 @@ 
 				]
 			);
 
-			$piwikTracking = $app['session']->get( 'piwikTracking' );
-			$this->assertSame( 'BEZ', $piwikTracking['paymentType'] );
-			$this->assertSame( 3, $piwikTracking['paymentInterval'] );
-			$this->assertSame( '5,00', $piwikTracking['paymentAmount'] );
+			$piwikTracking = $app['session']->get('piwikTracking');
+			$this->assertSame('BEZ', $piwikTracking['paymentType']);
+			$this->assertSame(3, $piwikTracking['paymentInterval']);
+			$this->assertSame('5,00', $piwikTracking['paymentAmount']);
 		} );
 	}
 
 	public function testWhenTolstojNovelIsPassed_isIsNotStoredInSession() {
-		$this->createAppEnvironment( [], function ( Client $client, FunFunFactory $factory, Application $app ) {
+		$this->createAppEnvironment([], function(Client $client, FunFunFactory $factory, Application $app) {
 
 			$client->request(
 				'GET',
@@ -587,15 +587,15 @@ 
 				]
 			);
 
-			$piwikTracking = $app['session']->get( 'piwikTracking' );
-			$this->assertArrayNotHasKey( 'paymentType', $piwikTracking );
-			$this->assertSame( 3, $piwikTracking['paymentInterval'] );
-			$this->assertSame( '5,00', $piwikTracking['paymentAmount'] );
+			$piwikTracking = $app['session']->get('piwikTracking');
+			$this->assertArrayNotHasKey('paymentType', $piwikTracking);
+			$this->assertSame(3, $piwikTracking['paymentInterval']);
+			$this->assertSame('5,00', $piwikTracking['paymentAmount']);
 		} );
 	}
 
 	public function testWhenParameterIsOmitted_itIsNotStoredInSession() {
-		$this->createAppEnvironment( [], function ( Client $client, FunFunFactory $factory, Application $app ) {
+		$this->createAppEnvironment([], function(Client $client, FunFunFactory $factory, Application $app) {
 
 			$client->request(
 				'GET',
@@ -606,15 +606,15 @@ 
 				]
 			);
 
-			$piwikTracking = $app['session']->get( 'piwikTracking' );
-			$this->assertSame( 'BEZ', $piwikTracking['paymentType'] );
-			$this->assertSame( '5,00', $piwikTracking['paymentAmount'] );
-			$this->assertArrayNotHasKey( 'paymentInterval', $piwikTracking );
+			$piwikTracking = $app['session']->get('piwikTracking');
+			$this->assertSame('BEZ', $piwikTracking['paymentType']);
+			$this->assertSame('5,00', $piwikTracking['paymentAmount']);
+			$this->assertArrayNotHasKey('paymentInterval', $piwikTracking);
 		} );
 	}
 
 	public function testWhenInitiallyIntendedPaymentOptionsDifferFromActual_itIsReflectedInPiwikTrackingEvents() {
-		$client = $this->createClient( [] );
+		$client = $this->createClient([]);
 		$client->request(
 			'GET',
 			'/',
@@ -638,28 +638,28 @@ 
 		$client->followRedirect();
 
 		$responseContent = $client->getResponse()->getContent();
-		$this->assertContains( 'BEZ/UEB', $responseContent );
-		$this->assertContains( '5.00/12.34', $responseContent );
-		$this->assertContains( '12/0', $responseContent );
+		$this->assertContains('BEZ/UEB', $responseContent);
+		$this->assertContains('5.00/12.34', $responseContent);
+		$this->assertContains('12/0', $responseContent);
 	}
 
 	public function testWhenMobileTrackingIsRequested_piwikTrackerIsCalledForPaypalPayment() {
-		$this->createEnvironment( [], function ( Client $client, FunFunFactory $factory ) {
+		$this->createEnvironment([], function(Client $client, FunFunFactory $factory) {
 			$factory->setNullMessenger();
-			$client->followRedirects( false );
+			$client->followRedirects(false);
 
-			$tracker = $this->getMockBuilder( PageViewTracker::class )->disableOriginalConstructor()->getMock();
-			$tracker->expects( $this->once() )
-				->method( 'trackPaypalRedirection' )
-				->with( 'test', 'gelb', '10.1.2.3' );
-			$factory->setPageViewTracker( $tracker );
+			$tracker = $this->getMockBuilder(PageViewTracker::class)->disableOriginalConstructor()->getMock();
+			$tracker->expects($this->once())
+				->method('trackPaypalRedirection')
+				->with('test', 'gelb', '10.1.2.3');
+			$factory->setPageViewTracker($tracker);
 
 			$client->request(
 				'POST',
 				'/donation/add',
 				$this->newValidMobilePayPalInput(),
 				[],
-				[ 'REMOTE_ADDR' => '10.1.2.3' ]
+				['REMOTE_ADDR' => '10.1.2.3']
 			);
 
 			$client->getResponse();
@@ -679,21 +679,21 @@ 
 	}
 
 	public function testWhenMobileTrackingIsRequested_piwikTrackerIsNotCalledForNonPaypalPayment() {
-		$this->createEnvironment( [], function ( Client $client, FunFunFactory $factory ) {
+		$this->createEnvironment([], function(Client $client, FunFunFactory $factory) {
 			$factory->setNullMessenger();
-			$client->followRedirects( false );
+			$client->followRedirects(false);
 
-			$tracker = $this->getMockBuilder( PageViewTracker::class )->disableOriginalConstructor()->getMock();
-			$tracker->expects( $this->never() )
-				->method( 'trackPaypalRedirection' );
-			$factory->setPageViewTracker( $tracker );
+			$tracker = $this->getMockBuilder(PageViewTracker::class)->disableOriginalConstructor()->getMock();
+			$tracker->expects($this->never())
+				->method('trackPaypalRedirection');
+			$factory->setPageViewTracker($tracker);
 
 			$client->request(
 				'POST',
 				'/donation/add',
 				array_merge(
 					$this->newValidCreditCardInput(),
-					[ 'mbt' => '1' ]
+					['mbt' => '1']
 				)
 			);
 
@@ -702,10 +702,10 @@ 
 	}
 
 	public function testGivenCommasInStreetInput_donationGetsPersisted() {
-		$this->createEnvironment( [], function ( Client $client, FunFunFactory $factory ) {
+		$this->createEnvironment([], function(Client $client, FunFunFactory $factory) {
 
-			$client->setServerParameter( 'HTTP_REFERER', 'https://en.wikipedia.org/wiki/Karla_Kennichnich' );
-			$client->followRedirects( false );
+			$client->setServerParameter('HTTP_REFERER', 'https://en.wikipedia.org/wiki/Karla_Kennichnich');
+			$client->followRedirects(false);
 
 			$formInput = $this->newValidFormInput();
 			$formInput['street'] = ',Lehmgasse, 12,';
@@ -716,12 +716,12 @@ 
 				$formInput
 			);
 
-			$this->assertIsExpectedDonation( $this->getDonationFromDatabase( $factory ) );
+			$this->assertIsExpectedDonation($this->getDonationFromDatabase($factory));
 		} );
 	}
 
 	public function testGivenSufficientForeignBankData_donationGetsPersisted() {
-		$this->createEnvironment( [], function ( Client $client, FunFunFactory $factory ) {
+		$this->createEnvironment([], function(Client $client, FunFunFactory $factory) {
 			$formInput = $this->newValidFormInput();
 			$formInput['iban'] = 'AT022050302101023600';
 			$formInput['bic'] = 'SPIHAT22XXX';
@@ -734,14 +734,14 @@ 
 				$formInput
 			);
 
-			$donation = $this->getDonationFromDatabase( $factory );
+			$donation = $this->getDonationFromDatabase($factory);
 			$data = $donation->getDecodedData();
 
-			$this->assertSame( 'AT022050302101023600', $data['iban'] );
-			$this->assertSame( 'SPIHAT22XXX', $data['bic'] );
-			$this->assertSame( '', $data['konto'] );
-			$this->assertSame( '', $data['blz'] );
-			$this->assertSame( '', $data['bankname'] );
+			$this->assertSame('AT022050302101023600', $data['iban']);
+			$this->assertSame('SPIHAT22XXX', $data['bic']);
+			$this->assertSame('', $data['konto']);
+			$this->assertSame('', $data['blz']);
+			$this->assertSame('', $data['bankname']);
 		} );
 	}
 

src/Validation/BankDataValidator.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types = 1);
 
 namespace WMDE\Fundraising\Frontend\Validation;
 
@@ -15,28 +15,28 @@ 
 
 	private $ibanValidator;
 
-	public function __construct( IbanValidator $ibanValidator ) {
+	public function __construct(IbanValidator $ibanValidator) {
 		$this->ibanValidator = $ibanValidator;
 	}
 
-	public function validate( BankData $bankData ): ValidationResult {
+	public function validate(BankData $bankData): ValidationResult {
 		$validator = new RequiredFieldValidator();
 		$violations = [];
 
-		$violations[] = $this->getFieldViolation( $validator->validate( $bankData->getIban()->toString() ), 'iban' );
-		$violations[] = $this->getFieldViolation( $validator->validate( $bankData->getBic() ), 'bic' );
+		$violations[] = $this->getFieldViolation($validator->validate($bankData->getIban()->toString()), 'iban');
+		$violations[] = $this->getFieldViolation($validator->validate($bankData->getBic()), 'bic');
 
-		if ( $bankData->getIban()->getCountryCode() === 'DE' ) {
+		if ($bankData->getIban()->getCountryCode() === 'DE') {
 			$stringLengthValidator = new StringLengthValidator();
-			$violations[] = $this->getFieldViolation( $validator->validate( $bankData->getAccount() ), 'konto' );
-			$violations[] = $this->getFieldViolation( $validator->validate( $bankData->getBankCode() ), 'blz' );
-			$violations[] = $this->getFieldViolation( $stringLengthValidator->validate( $bankData->getAccount(), 10 ), 'konto' );
-			$violations[] = $this->getFieldViolation( $stringLengthValidator->validate( $bankData->getBankCode(), 8 ), 'blz' );
+			$violations[] = $this->getFieldViolation($validator->validate($bankData->getAccount()), 'konto');
+			$violations[] = $this->getFieldViolation($validator->validate($bankData->getBankCode()), 'blz');
+			$violations[] = $this->getFieldViolation($stringLengthValidator->validate($bankData->getAccount(), 10), 'konto');
+			$violations[] = $this->getFieldViolation($stringLengthValidator->validate($bankData->getBankCode(), 8), 'blz');
 		}
 
-		$violations[] = $this->getFieldViolation( $this->ibanValidator->validate( $bankData->getIban() ), 'iban' );
+		$violations[] = $this->getFieldViolation($this->ibanValidator->validate($bankData->getIban()), 'iban');
 
-		return new ValidationResult( ...array_filter( $violations ) );
+		return new ValidationResult(...array_filter($violations));
 	}
 
 }