wmde / FundraisingFrontend

contexts/DonationContext/src/DataAccess/DoctrineDonationRepository.php

Spacing +181 added lines, -181 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types = 1);
 
 namespace WMDE\Fundraising\Frontend\DonationContext\DataAccess;
 
@@ -40,113 +40,113 @@ 
 
 	private $entityManager;
 
-	public function __construct( EntityManager $entityManager ) {
+	public function __construct(EntityManager $entityManager) {
 		$this->entityManager = $entityManager;
 	}
 
-	public function storeDonation( Donation $donation ) {
-		if ( $donation->getId() === null ) {
-			$this->insertDonation( $donation );
+	public function storeDonation(Donation $donation) {
+		if ($donation->getId() === null) {
+			$this->insertDonation($donation);
 		}
 		else {
-			$this->updateDonation( $donation );
+			$this->updateDonation($donation);
 		}
 	}
 
-	private function insertDonation( Donation $donation ) {
+	private function insertDonation(Donation $donation) {
 		$doctrineDonation = new DoctrineDonation();
-		$this->updateDonationEntity( $doctrineDonation, $donation );
+		$this->updateDonationEntity($doctrineDonation, $donation);
 
 		try {
-			$this->entityManager->persist( $doctrineDonation );
+			$this->entityManager->persist($doctrineDonation);
 			$this->entityManager->flush();
 		}
-		catch ( ORMException $ex ) {
-			throw new StoreDonationException( $ex );
+		catch (ORMException $ex) {
+			throw new StoreDonationException($ex);
 		}
 
-		$donation->assignId( $doctrineDonation->getId() );
+		$donation->assignId($doctrineDonation->getId());
 	}
 
-	private function updateDonation( Donation $donation ) {
-		$doctrineDonation = $this->getDoctrineDonationById( $donation->getId() );
+	private function updateDonation(Donation $donation) {
+		$doctrineDonation = $this->getDoctrineDonationById($donation->getId());
 
-		if ( $doctrineDonation === null ) {
+		if ($doctrineDonation === null) {
 			throw new StoreDonationException();
 		}
 
-		$this->updateDonationEntity( $doctrineDonation, $donation );
+		$this->updateDonationEntity($doctrineDonation, $donation);
 
 		try {
-			$this->entityManager->persist( $doctrineDonation );
+			$this->entityManager->persist($doctrineDonation);
 			$this->entityManager->flush();
 		}
-		catch ( ORMException $ex ) {
-			throw new StoreDonationException( $ex );
+		catch (ORMException $ex) {
+			throw new StoreDonationException($ex);
 		}
 	}
 
-	private function updateDonationEntity( DoctrineDonation $doctrineDonation, Donation $donation ) {
-		$doctrineDonation->setId( $donation->getId() );
-		$this->updatePaymentInformation( $doctrineDonation, $donation );
-		$this->updateDonorInformation( $doctrineDonation, $donation->getDonor() );
-		$this->updateComment( $doctrineDonation, $donation->getComment() );
-		$doctrineDonation->setDonorOptsIntoNewsletter( $donation->getOptsIntoNewsletter() );
+	private function updateDonationEntity(DoctrineDonation $doctrineDonation, Donation $donation) {
+		$doctrineDonation->setId($donation->getId());
+		$this->updatePaymentInformation($doctrineDonation, $donation);
+		$this->updateDonorInformation($doctrineDonation, $donation->getDonor());
+		$this->updateComment($doctrineDonation, $donation->getComment());
+		$doctrineDonation->setDonorOptsIntoNewsletter($donation->getOptsIntoNewsletter());
 
-		$doctrineDonation->encodeAndSetData( array_merge(
+		$doctrineDonation->encodeAndSetData(array_merge(
 			$doctrineDonation->getDecodedData(),
-			$this->getDataMap( $donation )
-		) );
+			$this->getDataMap($donation)
+		));
 	}
 
-	private function updatePaymentInformation( DoctrineDonation $doctrineDonation, Donation $donation ) {
-		$doctrineDonation->setStatus( $donation->getStatus() );
-		$doctrineDonation->setAmount( $donation->getAmount()->getEuroString() );
-		$doctrineDonation->setPaymentIntervalInMonths( $donation->getPaymentIntervalInMonths() );
+	private function updatePaymentInformation(DoctrineDonation $doctrineDonation, Donation $donation) {
+		$doctrineDonation->setStatus($donation->getStatus());
+		$doctrineDonation->setAmount($donation->getAmount()->getEuroString());
+		$doctrineDonation->setPaymentIntervalInMonths($donation->getPaymentIntervalInMonths());
 
-		$doctrineDonation->setPaymentType( $donation->getPaymentType() );
-		$doctrineDonation->setBankTransferCode( $this->getBankTransferCode( $donation->getPaymentMethod() ) );
+		$doctrineDonation->setPaymentType($donation->getPaymentType());
+		$doctrineDonation->setBankTransferCode($this->getBankTransferCode($donation->getPaymentMethod()));
 	}
 
-	private function updateDonorInformation( DoctrineDonation $doctrineDonation, Donor $donor = null ) {
-		if ( $donor === null ) {
-			$doctrineDonation->setDonorFullName( 'Anonym' );
+	private function updateDonorInformation(DoctrineDonation $doctrineDonation, Donor $donor = null) {
+		if ($donor === null) {
+			$doctrineDonation->setDonorFullName('Anonym');
 		} else {
-			$doctrineDonation->setDonorCity( $donor->getPhysicalAddress()->getCity() );
-			$doctrineDonation->setDonorEmail( $donor->getEmailAddress() );
-			$doctrineDonation->setDonorFullName( $donor->getName()->getFullName() );
+			$doctrineDonation->setDonorCity($donor->getPhysicalAddress()->getCity());
+			$doctrineDonation->setDonorEmail($donor->getEmailAddress());
+			$doctrineDonation->setDonorFullName($donor->getName()->getFullName());
 		}
 	}
 
-	private function updateComment( DoctrineDonation $doctrineDonation, DonationComment $comment = null ) {
-		if ( $comment === null ) {
-			$doctrineDonation->setIsPublic( false );
-			$doctrineDonation->setComment( '' );
-			$doctrineDonation->setPublicRecord( '' );
+	private function updateComment(DoctrineDonation $doctrineDonation, DonationComment $comment = null) {
+		if ($comment === null) {
+			$doctrineDonation->setIsPublic(false);
+			$doctrineDonation->setComment('');
+			$doctrineDonation->setPublicRecord('');
 		} else {
-			$doctrineDonation->setIsPublic( $comment->isPublic() );
-			$doctrineDonation->setComment( $comment->getCommentText() );
-			$doctrineDonation->setPublicRecord( $comment->getAuthorDisplayName() );
+			$doctrineDonation->setIsPublic($comment->isPublic());
+			$doctrineDonation->setComment($comment->getCommentText());
+			$doctrineDonation->setPublicRecord($comment->getAuthorDisplayName());
 		}
 	}
 
-	private function getBankTransferCode( PaymentMethod $paymentMethod ): string {
-		if ( $paymentMethod instanceof BankTransferPayment ) {
+	private function getBankTransferCode(PaymentMethod $paymentMethod): string {
+		if ($paymentMethod instanceof BankTransferPayment) {
 			return $paymentMethod->getBankTransferCode();
 		}
 
 		return '';
 	}
 
-	private function getDataMap( Donation $donation ): array {
+	private function getDataMap(Donation $donation): array {
 		return array_merge(
-			$this->getDataFieldsFromTrackingInfo( $donation->getTrackingInfo() ),
-			$this->getDataFieldsForPaymentData( $donation->getPaymentMethod() ),
-			$this->getDataFieldsFromDonor( $donation->getDonor() )
+			$this->getDataFieldsFromTrackingInfo($donation->getTrackingInfo()),
+			$this->getDataFieldsForPaymentData($donation->getPaymentMethod()),
+			$this->getDataFieldsFromDonor($donation->getDonor())
 		);
 	}
 
-	private function getDataFieldsFromTrackingInfo( DonationTrackingInfo $trackingInfo ): array {
+	private function getDataFieldsFromTrackingInfo(DonationTrackingInfo $trackingInfo): array {
 		return [
 			'layout' => $trackingInfo->getLayout(),
 			'impCount' => $trackingInfo->getTotalImpressionCount(),
@@ -158,23 +158,23 @@ 
 		];
 	}
 
-	private function getDataFieldsForPaymentData( PaymentMethod $paymentMethod ): array {
-		if ( $paymentMethod instanceof DirectDebitPayment ) {
-			return $this->getDataFieldsFromBankData( $paymentMethod->getBankData() );
+	private function getDataFieldsForPaymentData(PaymentMethod $paymentMethod): array {
+		if ($paymentMethod instanceof DirectDebitPayment) {
+			return $this->getDataFieldsFromBankData($paymentMethod->getBankData());
 		}
 
-		if ( $paymentMethod instanceof PayPalPayment ) {
-			return $this->getDataFieldsFromPayPalData( $paymentMethod->getPayPalData() );
+		if ($paymentMethod instanceof PayPalPayment) {
+			return $this->getDataFieldsFromPayPalData($paymentMethod->getPayPalData());
 		}
 
-		if ( $paymentMethod instanceof CreditCardPayment ) {
-			return $this->getDataFieldsFromCreditCardData( $paymentMethod->getCreditCardData() );
+		if ($paymentMethod instanceof CreditCardPayment) {
+			return $this->getDataFieldsFromCreditCardData($paymentMethod->getCreditCardData());
 		}
 
 		return [];
 	}
 
-	private function getDataFieldsFromBankData( BankData $bankData ): array {
+	private function getDataFieldsFromBankData(BankData $bankData): array {
 		return [
 			'iban' => $bankData->getIban()->toString(),
 			'bic' => $bankData->getBic(),
@@ -184,19 +184,19 @@ 
 		];
 	}
 
-	private function getDataFieldsFromDonor( Donor $personalInfo = null ): array {
-		if ( $personalInfo === null ) {
-			return [ 'adresstyp' => 'anonym' ];
+	private function getDataFieldsFromDonor(Donor $personalInfo = null): array {
+		if ($personalInfo === null) {
+			return ['adresstyp' => 'anonym'];
 		}
 
 		return array_merge(
-			$this->getDataFieldsFromPersonName( $personalInfo->getName() ),
-			$this->getDataFieldsFromAddress( $personalInfo->getPhysicalAddress() ),
-			[ 'email' => $personalInfo->getEmailAddress() ]
+			$this->getDataFieldsFromPersonName($personalInfo->getName()),
+			$this->getDataFieldsFromAddress($personalInfo->getPhysicalAddress()),
+			['email' => $personalInfo->getEmailAddress()]
 		);
 	}
 
-	private function getDataFieldsFromPersonName( DonorName $name ) {
+	private function getDataFieldsFromPersonName(DonorName $name) {
 		return [
 			'adresstyp' => $name->getPersonType(),
 			'anrede' => $name->getSalutation(),
@@ -207,7 +207,7 @@ 
 		];
 	}
 
-	private function getDataFieldsFromAddress( DonorAddress $address ) {
+	private function getDataFieldsFromAddress(DonorAddress $address) {
 		return [
 			'strasse' => $address->getStreetAddress(),
 			'plz' => $address->getPostalCode(),
@@ -216,7 +216,7 @@ 
 		];
 	}
 
-	private function getDataFieldsFromPayPalData( PayPalData $payPalData ) {
+	private function getDataFieldsFromPayPalData(PayPalData $payPalData) {
 		return [
 			'paypal_payer_id' => $payPalData->getPayerId(),
 			'paypal_subscr_id' => $payPalData->getSubscriberId(),
@@ -238,11 +238,11 @@ 
 		];
 	}
 
-	private function getDataFieldsFromCreditCardData( CreditCardTransactionData $ccData ) {
+	private function getDataFieldsFromCreditCardData(CreditCardTransactionData $ccData) {
 		return [
 			'ext_payment_id' => $ccData->getTransactionId(),
 			'ext_payment_status' => $ccData->getTransactionStatus(),
-			'ext_payment_timestamp' => $ccData->getTransactionTimestamp()->format( \DateTime::ATOM ),
+			'ext_payment_timestamp' => $ccData->getTransactionTimestamp()->format(\DateTime::ATOM),
 			'mcp_amount' => $ccData->getAmount()->getEuroString(),
 			'ext_payment_account' => $ccData->getCustomerId(),
 			'mcp_sessionid' => $ccData->getSessionId(),
@@ -250,16 +250,16 @@ 
 			'mcp_title' => $ccData->getTitle(),
 			'mcp_country' => $ccData->getCountryCode(),
 			'mcp_currency' => $ccData->getCurrencyCode(),
-			'mcp_cc_expiry_date' => $this->getExpirationDateAsString( $ccData->getCardExpiry() )
+			'mcp_cc_expiry_date' => $this->getExpirationDateAsString($ccData->getCardExpiry())
 		];
 	}
 
-	private function getExpirationDateAsString( CreditCardExpiry $cardExpiry = null ): string {
-		if ( $cardExpiry === null ) {
+	private function getExpirationDateAsString(CreditCardExpiry $cardExpiry = null): string {
+		if ($cardExpiry === null) {
 			return '';
 		}
 
-		return implode( '/', [ $cardExpiry->getMonth(), $cardExpiry->getYear() ] );
+		return implode('/', [$cardExpiry->getMonth(), $cardExpiry->getYear()]);
 	}
 
 	/**
@@ -268,19 +268,19 @@ 
 	 * @return Donation|null
 	 * @throws GetDonationException
 	 */
-	public function getDonationById( int $id ) {
+	public function getDonationById(int $id) {
 		try {
-			$donation = $this->getDoctrineDonationById( $id );
+			$donation = $this->getDoctrineDonationById($id);
 		}
-		catch ( ORMException $ex ) {
-			throw new GetDonationException( $ex );
+		catch (ORMException $ex) {
+			throw new GetDonationException($ex);
 		}
 
-		if ( $donation === null ) {
+		if ($donation === null) {
 			return null;
 		}
 
-		return $this->newDonationDomainObject( $donation );
+		return $this->newDonationDomainObject($donation);
 	}
 
 	/**
@@ -288,22 +288,22 @@ 
 	 * @return DoctrineDonation|null
 	 * @throws ORMException
 	 */
-	public function getDoctrineDonationById( int $id ) {
-		return $this->entityManager->getRepository( DoctrineDonation::class )->findOneBy( [
+	public function getDoctrineDonationById(int $id) {
+		return $this->entityManager->getRepository(DoctrineDonation::class)->findOneBy([
 			'id' => $id,
 			'deletionTime' => null
-		] );
+		]);
 	}
 
-	private function newDonationDomainObject( DoctrineDonation $dd ): Donation {
+	private function newDonationDomainObject(DoctrineDonation $dd): Donation {
 		return new Donation(
 			$dd->getId(),
 			$dd->getStatus(),
-			$this->getDonorFromEntity( $dd ),
-			$this->getPaymentFromEntity( $dd ),
+			$this->getDonorFromEntity($dd),
+			$this->getPaymentFromEntity($dd),
 			(bool)$dd->getDonorOptsIntoNewsletter(),
-			$this->getTrackingInfoFromEntity( $dd ),
-			$this->getCommentFromEntity( $dd )
+			$this->getTrackingInfoFromEntity($dd),
+			$this->getCommentFromEntity($dd)
 		);
 	}
 
@@ -312,83 +312,83 @@ 
 	 *
 	 * @return Donor|null
 	 */
-	private function getDonorFromEntity( DoctrineDonation $dd ) {
-		if ( $dd->getDonorEmail() === null ) {
+	private function getDonorFromEntity(DoctrineDonation $dd) {
+		if ($dd->getDonorEmail() === null) {
 			return null;
 		}
 
 		// This should not happen, but it does (but only with PayPal payments in production), so as a step towards fixing this, we log
-		if ( $this->entityHasMissingFields( $dd ) ) {
-			error_log( sprintf(
+		if ($this->entityHasMissingFields($dd)) {
+			error_log(sprintf(
 				'Entity %d has missing fields. Field data: %s',
 				$dd->getId(),
-				var_export( $dd->getDecodedData(), true ) )
+				var_export($dd->getDecodedData(), true) )
 			);
-			error_log( implode( "\n", array_map( function( $bt ) {
-				return sprintf( '%s, line %d, %s', $bt['file'], $bt['line'], $bt['function'] );
-			}, debug_backtrace() ) ) );
+			error_log(implode("\n", array_map(function($bt) {
+				return sprintf('%s, line %d, %s', $bt['file'], $bt['line'], $bt['function']);
+			}, debug_backtrace())));
 			return null;
 		}
 
 		return new Donor(
-			$this->getPersonNameFromEntity( $dd ),
-			$this->getPhysicalAddressFromEntity( $dd ),
+			$this->getPersonNameFromEntity($dd),
+			$this->getPhysicalAddressFromEntity($dd),
 			$dd->getDonorEmail()
 		);
 	}
 
-	private function getPaymentFromEntity( DoctrineDonation $dd ): DonationPayment {
+	private function getPaymentFromEntity(DoctrineDonation $dd): DonationPayment {
 		return new DonationPayment(
-			Euro::newFromString( $dd->getAmount() ),
+			Euro::newFromString($dd->getAmount()),
 			$dd->getPaymentIntervalInMonths(),
-			$this->getPaymentMethodFromEntity( $dd )
+			$this->getPaymentMethodFromEntity($dd)
 		);
 	}
 
-	private function getPaymentMethodFromEntity( DoctrineDonation $dd ): PaymentMethod {
-		if ( $dd->getPaymentType() === PaymentType::BANK_TRANSFER ) {
-			return new BankTransferPayment( $dd->getBankTransferCode() );
+	private function getPaymentMethodFromEntity(DoctrineDonation $dd): PaymentMethod {
+		if ($dd->getPaymentType() === PaymentType::BANK_TRANSFER) {
+			return new BankTransferPayment($dd->getBankTransferCode());
 		}
 
-		if ( $dd->getPaymentType() === PaymentType::DIRECT_DEBIT ) {
-			return new DirectDebitPayment( $this->getBankDataFromEntity( $dd ) );
+		if ($dd->getPaymentType() === PaymentType::DIRECT_DEBIT) {
+			return new DirectDebitPayment($this->getBankDataFromEntity($dd));
 		}
 
-		if ( $dd->getPaymentType() === PaymentType::PAYPAL ) {
-			return new PayPalPayment( $this->getPayPalDataFromEntity( $dd ) );
+		if ($dd->getPaymentType() === PaymentType::PAYPAL) {
+			return new PayPalPayment($this->getPayPalDataFromEntity($dd));
 		}
 
-		if ( $dd->getPaymentType() === PaymentType::CREDIT_CARD ) {
-			return new CreditCardPayment( $this->getCreditCardDataFromEntity( $dd ) );
+		if ($dd->getPaymentType() === PaymentType::CREDIT_CARD) {
+			return new CreditCardPayment($this->getCreditCardDataFromEntity($dd));
 		}
 
-		return new PaymentWithoutAssociatedData( $dd->getPaymentType() );
+		return new PaymentWithoutAssociatedData($dd->getPaymentType());
 	}
 
-	private function getPersonNameFromEntity( DoctrineDonation $dd ): DonorName {
+	private function getPersonNameFromEntity(DoctrineDonation $dd): DonorName {
 		$data = $dd->getDecodedData();
 
 		$name = $data['adresstyp'] === DonorName::PERSON_COMPANY
 			? DonorName::newCompanyName() : DonorName::newPrivatePersonName();
 
-		$name->setSalutation( $data['anrede'] );
-		$name->setTitle( $data['titel'] );
-		$name->setFirstName( $data['vorname'] );
-		$name->setLastName( $data['nachname'] );
-		$name->setCompanyName( $data['firma'] );
+		$name->setSalutation($data['anrede']);
+		$name->setTitle($data['titel']);
+		$name->setFirstName($data['vorname']);
+		$name->setLastName($data['nachname']);
+		$name->setCompanyName($data['firma']);
 
 		return $name->freeze()->assertNoNullFields();
 	}
 
-	private function getPhysicalAddressFromEntity( DoctrineDonation $dd ): DonorAddress {
+	private function getPhysicalAddressFromEntity(DoctrineDonation $dd): DonorAddress {
 		$data = $dd->getDecodedData();
 
 		$address = new DonorAddress();
 
-		$address->setStreetAddress( $data['strasse'] );
-		$address->setCity( $data['ort'] );
-		$address->setPostalCode( $data['plz'] );
-		$address->setCountryCode( $data['country'] );
+		$address->setStreetAddress($data['strasse']);
+		$address->setCity($data['ort']);
+		$address->setPostalCode($data['plz']);
+		$address->setCountryCode($data['country']);
 
 		return $address->freeze()->assertNoNullFields();
 	}
@@ -398,17 +398,17 @@ 
 	 *
 	 * @return BankData|null
 	 */
-	private function getBankDataFromEntity( DoctrineDonation $dd ) {
+	private function getBankDataFromEntity(DoctrineDonation $dd) {
 		$data = $dd->getDecodedData();
 
-		if ( array_key_exists( 'iban', $data ) ) {
+		if (array_key_exists('iban', $data)) {
 			$bankData = new BankData();
 
-			$bankData->setIban( new Iban( $data['iban'] ) );
-			$bankData->setBic( $data['bic'] );
-			$bankData->setAccount( $data['konto'] );
-			$bankData->setBankCode( $data['blz'] );
-			$bankData->setBankName( $data['bankname'] );
+			$bankData->setIban(new Iban($data['iban']));
+			$bankData->setBic($data['bic']);
+			$bankData->setAccount($data['konto']);
+			$bankData->setBankCode($data['blz']);
+			$bankData->setBankName($data['bankname']);
 
 			return $bankData->freeze()->assertNoNullFields();
 		}
@@ -416,18 +416,18 @@ 
 		return null;
 	}
 
-	private function getTrackingInfoFromEntity( DoctrineDonation $dd ): DonationTrackingInfo {
+	private function getTrackingInfoFromEntity(DoctrineDonation $dd): DonationTrackingInfo {
 		$data = $dd->getDecodedData();
 
 		$trackingInfo = new DonationTrackingInfo();
 
-		$trackingInfo->setLayout( $data['layout'] );
-		$trackingInfo->setTotalImpressionCount( $data['impCount'] );
-		$trackingInfo->setSingleBannerImpressionCount( $data['bImpCount'] );
-		$trackingInfo->setTracking( $data['tracking'] );
-		$trackingInfo->setSkin( $data['skin'] );
-		$trackingInfo->setColor( $data['color'] );
-		$trackingInfo->setSource( $data['source'] );
+		$trackingInfo->setLayout($data['layout']);
+		$trackingInfo->setTotalImpressionCount($data['impCount']);
+		$trackingInfo->setSingleBannerImpressionCount($data['bImpCount']);
+		$trackingInfo->setTracking($data['tracking']);
+		$trackingInfo->setSkin($data['skin']);
+		$trackingInfo->setColor($data['color']);
+		$trackingInfo->setSource($data['source']);
 
 		return $trackingInfo->freeze()->assertNoNullFields();
 	}
@@ -436,26 +436,26 @@ 
 	 * @param DoctrineDonation $dd
 	 * @return PayPalData|null
 	 */
-	private function getPayPalDataFromEntity( DoctrineDonation $dd ) {
+	private function getPayPalDataFromEntity(DoctrineDonation $dd) {
 		$data = $dd->getDecodedData();
 
-		if ( array_key_exists( 'paypal_payer_id', $data ) ) {
-			return ( new PayPalData() )
-				->setPayerId( $data['paypal_payer_id'] )
-				->setSubscriberId( $data['paypal_subscr_id'] )
-				->setPayerStatus( $data['paypal_payer_status'] )
-				->setAddressStatus( $data['paypal_address_status'] )
-				->setAmount( Euro::newFromString( $data['paypal_mc_gross'] ) )
-				->setCurrencyCode( $data['paypal_mc_currency'] )
-				->setFee( Euro::newFromString( $data['paypal_mc_fee'] ) )
-				->setSettleAmount( Euro::newFromString( $data['paypal_settle_amount'] ) )
-				->setFirstName( $data['paypal_first_name'] )
-				->setLastName( $data['paypal_last_name'] )
-				->setAddressName( $data['paypal_address_name'] )
-				->setPaymentId( $data['ext_payment_id'] )
-				->setPaymentType( $data['ext_payment_type'] )
-				->setPaymentStatus( $data['ext_payment_status'] )
-				->setPaymentTimestamp( $data['ext_payment_timestamp'] )
+		if (array_key_exists('paypal_payer_id', $data)) {
+			return (new PayPalData())
+				->setPayerId($data['paypal_payer_id'])
+				->setSubscriberId($data['paypal_subscr_id'])
+				->setPayerStatus($data['paypal_payer_status'])
+				->setAddressStatus($data['paypal_address_status'])
+				->setAmount(Euro::newFromString($data['paypal_mc_gross']))
+				->setCurrencyCode($data['paypal_mc_currency'])
+				->setFee(Euro::newFromString($data['paypal_mc_fee']))
+				->setSettleAmount(Euro::newFromString($data['paypal_settle_amount']))
+				->setFirstName($data['paypal_first_name'])
+				->setLastName($data['paypal_last_name'])
+				->setAddressName($data['paypal_address_name'])
+				->setPaymentId($data['ext_payment_id'])
+				->setPaymentType($data['ext_payment_type'])
+				->setPaymentStatus($data['ext_payment_status'])
+				->setPaymentTimestamp($data['ext_payment_timestamp'])
 				->freeze()->assertNoNullFields();
 		}
 
@@ -466,22 +466,22 @@ 
 	 * @param DoctrineDonation $dd
 	 * @return CreditCardTransactionData|null
 	 */
-	private function getCreditCardDataFromEntity( DoctrineDonation $dd ) {
+	private function getCreditCardDataFromEntity(DoctrineDonation $dd) {
 		$data = $dd->getDecodedData();
 
-		if ( array_key_exists( 'mcp_auth', $data ) ) {
-			return ( new CreditCardTransactionData() )
-				->setTransactionId( $data['ext_payment_id'] )
-				->setTransactionStatus( $data['ext_payment_status'] )
-				->setTransactionTimestamp( new \DateTime( $data['ext_payment_timestamp'] ) )
-				->setAmount( Euro::newFromString( $data['mcp_amount'] ) )
-				->setCustomerId( $data['ext_payment_account'] )
-				->setSessionId( $data['mcp_sessionid'] )
-				->setAuthId( $data['mcp_auth'] )
-				->setCardExpiry( CreditCardExpiry::newFromString( $data['mcp_cc_expiry_date'] ) )
-				->setTitle( $data['mcp_title'] )
-				->setCountryCode( $data['mcp_country'] )
-				->setCurrencyCode( $data['mcp_currency'] )
+		if (array_key_exists('mcp_auth', $data)) {
+			return (new CreditCardTransactionData())
+				->setTransactionId($data['ext_payment_id'])
+				->setTransactionStatus($data['ext_payment_status'])
+				->setTransactionTimestamp(new \DateTime($data['ext_payment_timestamp']))
+				->setAmount(Euro::newFromString($data['mcp_amount']))
+				->setCustomerId($data['ext_payment_account'])
+				->setSessionId($data['mcp_sessionid'])
+				->setAuthId($data['mcp_auth'])
+				->setCardExpiry(CreditCardExpiry::newFromString($data['mcp_cc_expiry_date']))
+				->setTitle($data['mcp_title'])
+				->setCountryCode($data['mcp_country'])
+				->setCurrencyCode($data['mcp_currency'])
 				->freeze();
 		}
 
@@ -492,8 +492,8 @@ 
 	 * @param DoctrineDonation $dd
 	 * @return DonationComment|null
 	 */
-	private function getCommentFromEntity( DoctrineDonation $dd ) {
-		if ( $dd->getComment() === '' ) {
+	private function getCommentFromEntity(DoctrineDonation $dd) {
+		if ($dd->getComment() === '') {
 			return null;
 		}
 
@@ -504,14 +504,14 @@ 
 		);
 	}
 
-	private function entityHasMissingFields( DoctrineDonation $dd ): bool {
+	private function entityHasMissingFields(DoctrineDonation $dd): bool {
 		$data = $dd->getDecodedData();
 		return
-			!isset( $data['anrede'] ) || $data['anrede'] === null ||
-			!isset( $data['titel'] ) || $data['titel'] === null ||
-			!isset( $data['vorname'] ) || $data['vorname'] === null ||
-			!isset( $data['nachname'] ) || $data['nachname'] === null ||
-			!isset( $data['firma'] ) || $data['firma'] === null;
+			!isset($data['anrede']) || $data['anrede'] === null ||
+			!isset($data['titel']) || $data['titel'] === null ||
+			!isset($data['vorname']) || $data['vorname'] === null ||
+			!isset($data['nachname']) || $data['nachname'] === null ||
+			!isset($data['firma']) || $data['firma'] === null;
 	}
 
 }