wmde / FundraisingFrontend

app/RouteHandlers/AddSubscriptionHandler.php

Spacing +33 added lines, -33 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types = 1);
 
 namespace WMDE\Fundraising\Frontend\App\RouteHandlers;
 
@@ -19,66 +19,66 @@ 
 	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 {
+	public function handle(Request $request): Response {
 		$useCase = $this->ffFactory->newAddSubscriptionUseCase();
 
-		$responseModel = $useCase->addSubscription( $this->createSubscriptionRequest( $request ) );
+		$responseModel = $useCase->addSubscription($this->createSubscriptionRequest($request));
 
-		if ( $this->app['request_stack.is_json'] ) {
-			return $this->app->json( $this->ffFactory->newAddSubscriptionJsonPresenter()->present( $responseModel ) );
-		} elseif ( $request->query->has( 'callback' ) ) {
-			return $this->app->json( $this->ffFactory->newAddSubscriptionJsonPresenter()->present( $responseModel ) )
-				->setCallback( $request->query->get( 'callback' ) );
+		if ($this->app['request_stack.is_json']) {
+			return $this->app->json($this->ffFactory->newAddSubscriptionJsonPresenter()->present($responseModel));
+		} elseif ($request->query->has('callback')) {
+			return $this->app->json($this->ffFactory->newAddSubscriptionJsonPresenter()->present($responseModel))
+				->setCallback($request->query->get('callback'));
 		}
 
-		if ( $responseModel->isSuccessful() ) {
-			if ( $responseModel->needsModeration() ) {
-				return $this->app->redirect( $this->app['url_generator']->generate('page', [ 'pageName' => 'Subscription_Moderation' ] ) );
+		if ($responseModel->isSuccessful()) {
+			if ($responseModel->needsModeration()) {
+				return $this->app->redirect($this->app['url_generator']->generate('page', ['pageName' => 'Subscription_Moderation']));
 			}
-			return $this->app->redirect( $this->app['url_generator']->generate('page', [ 'pageName' => 'Subscription_Success' ] ) );
+			return $this->app->redirect($this->app['url_generator']->generate('page', ['pageName' => 'Subscription_Success']));
 		}
 
 		return new Response(
-			$this->ffFactory->newAddSubscriptionHtmlPresenter()->present( $responseModel, $request->request->all() )
+			$this->ffFactory->newAddSubscriptionHtmlPresenter()->present($responseModel, $request->request->all())
 		);
 	}
 
-	private function createSubscriptionRequest( Request $request ): SubscriptionRequest {
+	private function createSubscriptionRequest(Request $request): SubscriptionRequest {
 		$subscriptionRequest = new SubscriptionRequest();
 
-		$this->addAddressDataFromRequest( $subscriptionRequest, $request );
+		$this->addAddressDataFromRequest($subscriptionRequest, $request);
 
-		$subscriptionRequest->setEmail( $request->get( 'email', '' ) );
+		$subscriptionRequest->setEmail($request->get('email', ''));
 
-		$subscriptionRequest->setWikiloginFromValues( [
-			$request->request->get( 'wikilogin' ),
-			$request->cookies->get( 'spenden_wikilogin' ),
-		] );
+		$subscriptionRequest->setWikiloginFromValues([
+			$request->request->get('wikilogin'),
+			$request->cookies->get('spenden_wikilogin'),
+		]);
 
-		$this->addTrackingDataFromRequest( $subscriptionRequest, $request );
+		$this->addTrackingDataFromRequest($subscriptionRequest, $request);
 
 		return $subscriptionRequest;
 	}
 
-	private function addAddressDataFromRequest( SubscriptionRequest $subscriptionRequest, Request $request ) {
-		$subscriptionRequest->setAddress( $request->get( 'address', '' ) );
-		$subscriptionRequest->setCity( $request->get( 'city', '' ) );
-		$subscriptionRequest->setPostcode( $request->get( 'postcode', '' ) );
+	private function addAddressDataFromRequest(SubscriptionRequest $subscriptionRequest, Request $request) {
+		$subscriptionRequest->setAddress($request->get('address', ''));
+		$subscriptionRequest->setCity($request->get('city', ''));
+		$subscriptionRequest->setPostcode($request->get('postcode', ''));
 
-		$subscriptionRequest->setFirstName( $request->get( 'firstName', '' ) );
-		$subscriptionRequest->setLastName( $request->get( 'lastName', '' ) );
-		$subscriptionRequest->setSalutation( $request->get( 'salutation', '' ) );
-		$subscriptionRequest->setTitle( $request->get( 'title', '' ) );
+		$subscriptionRequest->setFirstName($request->get('firstName', ''));
+		$subscriptionRequest->setLastName($request->get('lastName', ''));
+		$subscriptionRequest->setSalutation($request->get('salutation', ''));
+		$subscriptionRequest->setTitle($request->get('title', ''));
 
 	}
 
-	private function addTrackingDataFromRequest( SubscriptionRequest $subscriptionRequest, Request $request ) {
-		$subscriptionRequest->setSource( $request->get( 'source', '' ) );
-		$subscriptionRequest->setTrackingString( $request->attributes->get( 'trackingCode', '' ) );
+	private function addTrackingDataFromRequest(SubscriptionRequest $subscriptionRequest, Request $request) {
+		$subscriptionRequest->setSource($request->get('source', ''));
+		$subscriptionRequest->setTrackingString($request->attributes->get('trackingCode', ''));
 	}
 }
\ No newline at end of file

app/routes.php

Spacing +199 added lines, -199 removed lines

@@ -7,7 +7,7 @@ 
  * @var \WMDE\Fundraising\Frontend\Factories\FunFunFactory $ffFactory
  */
 
-declare( strict_types = 1 );
+declare(strict_types = 1);
 
 use Silex\Application;
 use Symfony\Component\HttpFoundation\Request;
@@ -44,129 +44,129 @@ 
 
 $app->post(
 	'validate-email',
-	function( Request $request ) use ( $app, $ffFactory ) {
-		$validationResult = $ffFactory->getEmailValidator()->validate( $request->request->get( 'email', '' ) );
-		return $app->json( [ 'status' => $validationResult->isSuccessful() ? 'OK' : 'ERR' ] );
+	function(Request $request) use ($app, $ffFactory) {
+		$validationResult = $ffFactory->getEmailValidator()->validate($request->request->get('email', ''));
+		return $app->json(['status' => $validationResult->isSuccessful() ? 'OK' : 'ERR']);
 	}
 );
 
 $app->post(
 	'validate-payment-data',
-	function( Request $request ) use ( $app, $ffFactory ) {
+	function(Request $request) use ($app, $ffFactory) {
 
-		$amount = (float) $ffFactory->newDecimalNumberFormatter()->parse( $request->get( 'amount', '0' ) );
+		$amount = (float)$ffFactory->newDecimalNumberFormatter()->parse($request->get('amount', '0'));
 		$validator = $ffFactory->newPaymentDataValidator();
-		$validationResult = $validator->validate( $amount, (string) $request->get( 'paymentType', '' ) );
+		$validationResult = $validator->validate($amount, (string)$request->get('paymentType', ''));
 
-		if ( $validationResult->isSuccessful() ) {
-			return $app->json( [ 'status' => 'OK' ] );
+		if ($validationResult->isSuccessful()) {
+			return $app->json(['status' => 'OK']);
 		} else {
 			$errors = [];
-			foreach( $validationResult->getViolations() as $violation ) {
-				$errors[ $violation->getSource() ] = $ffFactory->getTranslator()->trans( $violation->getMessageIdentifier() );
+			foreach ($validationResult->getViolations() as $violation) {
+				$errors[$violation->getSource()] = $ffFactory->getTranslator()->trans($violation->getMessageIdentifier());
 			}
-			return $app->json( [ 'status' => 'ERR', 'messages' => $errors ] );
+			return $app->json(['status' => 'ERR', 'messages' => $errors]);
 		}
 	}
 );
 
 $app->post(
 	'validate-address',
-	function( Request $request ) use ( $app, $ffFactory ) {
+	function(Request $request) use ($app, $ffFactory) {
 		$routeHandler = new class() {
 
-			public function handle( FunFunFactory $ffFactory, Application $app, Request $request ) {
-				if ( $request->get( 'adressType', '' ) === 'anonym' ) {
-					return $app->json( [ 'status' => 'OK' ] );
+			public function handle(FunFunFactory $ffFactory, Application $app, Request $request) {
+				if ($request->get('adressType', '') === 'anonym') {
+					return $app->json(['status' => 'OK']);
 				}
 
-				$personalInfo = $this->getPersonalInfoFromRequest( $request );
+				$personalInfo = $this->getPersonalInfoFromRequest($request);
 				$personalInfoValidator = $ffFactory->newPersonalInfoValidator();
-				$validationResult = $personalInfoValidator->validate( $personalInfo );
+				$validationResult = $personalInfoValidator->validate($personalInfo);
 
-				if ( $validationResult->isSuccessful() ) {
-					return $app->json( [ 'status' => 'OK' ] );
+				if ($validationResult->isSuccessful()) {
+					return $app->json(['status' => 'OK']);
 				} else {
 					$errors = [];
-					foreach( $validationResult->getViolations() as $violation ) {
-						$errors[$violation->getSource()] = $ffFactory->getTranslator()->trans( $violation->getMessageIdentifier() );
+					foreach ($validationResult->getViolations() as $violation) {
+						$errors[$violation->getSource()] = $ffFactory->getTranslator()->trans($violation->getMessageIdentifier());
 					}
-					return $app->json( [ 'status' => 'ERR', 'messages' => $errors ] );
+					return $app->json(['status' => 'ERR', 'messages' => $errors]);
 				}
 			}
 
-			private function getPersonalInfoFromRequest( Request $request ): Donor {
+			private function getPersonalInfoFromRequest(Request $request): Donor {
 				return new Donor(
-					$this->getNameFromRequest( $request ),
-					$this->getPhysicalAddressFromRequest( $request ),
-					$request->get( 'email', '' )
+					$this->getNameFromRequest($request),
+					$this->getPhysicalAddressFromRequest($request),
+					$request->get('email', '')
 				);
 			}
 
-			private function getPhysicalAddressFromRequest( Request $request ): DonorAddress {
+			private function getPhysicalAddressFromRequest(Request $request): DonorAddress {
 				$address = new DonorAddress();
 
-				$address->setStreetAddress( $request->get( 'street', '' ) );
-				$address->setPostalCode( $request->get( 'postcode', '' ) );
-				$address->setCity( $request->get( 'city', '' ) );
-				$address->setCountryCode( $request->get( 'country', '' ) );
+				$address->setStreetAddress($request->get('street', ''));
+				$address->setPostalCode($request->get('postcode', ''));
+				$address->setCity($request->get('city', ''));
+				$address->setCountryCode($request->get('country', ''));
 
 				return $address->freeze()->assertNoNullFields();
 			}
 
-			private function getNameFromRequest( Request $request ): DonorName {
-				$name = $request->get( 'addressType', '' ) === 'firma'
+			private function getNameFromRequest(Request $request): DonorName {
+				$name = $request->get('addressType', '') === 'firma'
 					? DonorName::newCompanyName() : DonorName::newPrivatePersonName();
 
-				$name->setSalutation( $request->get( 'salutation', '' ) );
-				$name->setTitle( $request->get( 'title', '' ) );
-				$name->setCompanyName( $request->get( 'companyName', '' ) );
-				$name->setFirstName( $request->get( 'firstName', '' ) );
-				$name->setLastName( $request->get( 'lastName', '' ) );
+				$name->setSalutation($request->get('salutation', ''));
+				$name->setTitle($request->get('title', ''));
+				$name->setCompanyName($request->get('companyName', ''));
+				$name->setFirstName($request->get('firstName', ''));
+				$name->setLastName($request->get('lastName', ''));
 
 				return $name->freeze()->assertNoNullFields();
 			}
 		};
 
-		return $routeHandler->handle( $ffFactory, $app, $request );
+		return $routeHandler->handle($ffFactory, $app, $request);
 	}
 );
 
 $app->post(
 	'validate-fee',
-	function( Request $httpRequest ) use ( $app, $ffFactory ) {
+	function(Request $httpRequest) use ($app, $ffFactory) {
 		$validator = new MembershipFeeValidator();
 		$result = $validator->validate(
-			str_replace( ',', '.', $httpRequest->request->get( 'amount', '' ) ),
-			(int) $httpRequest->request->get( 'paymentIntervalInMonths', '0' ),
-			$httpRequest->request->get( 'addressType', '' )
+			str_replace(',', '.', $httpRequest->request->get('amount', '')),
+			(int)$httpRequest->request->get('paymentIntervalInMonths', '0'),
+			$httpRequest->request->get('addressType', '')
 		);
 
-		if ( $result->isSuccessful() ) {
-			return $app->json( [ 'status' => 'OK' ] );
+		if ($result->isSuccessful()) {
+			return $app->json(['status' => 'OK']);
 		} else {
 			$errors = $result->getViolations();
-			return $app->json( [ 'status' => 'ERR', 'messages' => $errors ] );
+			return $app->json(['status' => 'ERR', 'messages' => $errors]);
 		}
 	}
 );
 
 $app->get(
 	'list-comments.json',
-	function( Request $request ) use ( $app, $ffFactory ) {
+	function(Request $request) use ($app, $ffFactory) {
 		$response = $app->json(
 			$ffFactory->newCommentListJsonPresenter()->present(
 				$ffFactory->newListCommentsUseCase()->listComments(
 					new CommentListingRequest(
-						(int)$request->query->get( 'n', '10' ),
-						(int)$request->query->get( 'page', '1' )
+						(int)$request->query->get('n', '10'),
+						(int)$request->query->get('page', '1')
 					)
 				)
 			)
 		);
 
-		if ( $request->query->get( 'f' ) ) {
-			$response->setCallback( $request->query->get( 'f' ) );
+		if ($request->query->get('f')) {
+			$response->setCallback($request->query->get('f'));
 		}
 
 		return $response;
@@ -175,10 +175,10 @@ 
 
 $app->get(
 	'list-comments.rss',
-	function() use ( $app, $ffFactory ) {
+	function() use ($app, $ffFactory) {
 		$rss = $ffFactory->newCommentListRssPresenter()->present(
 			$ffFactory->newListCommentsUseCase()->listComments(
-				new CommentListingRequest( 100, CommentListingRequest::FIRST_PAGE )
+				new CommentListingRequest(100, CommentListingRequest::FIRST_PAGE)
 			)
 		);
 
@@ -191,147 +191,147 @@ 
 			]
 		);
 	}
-)->bind( 'list-comments.rss' );
+)->bind('list-comments.rss');
 
 $app->get(
 	'list-comments.html',
-	function( Request $request ) use ( $app, $ffFactory ) {
+	function(Request $request) use ($app, $ffFactory) {
 		return new Response(
 			$ffFactory->newCommentListHtmlPresenter()->present(
 				$ffFactory->newListCommentsUseCase()->listComments(
 					new CommentListingRequest(
 						10,
-						(int)$request->query->get( 'page', '1' )
+						(int)$request->query->get('page', '1')
 					)
 				),
-				(int)$request->query->get( 'page', '1' )
+				(int)$request->query->get('page', '1')
 			)
 		);
 	}
-)->bind( 'list-comments.html' );
+)->bind('list-comments.html');
 
 $app->get(
 	'page/{pageName}',
-	function( $pageName ) use ( $ffFactory ) {
-		if ( !$ffFactory->getTemplateNameValidator()->validate( $pageName . '.html.twig' )->isSuccessful() ) {
-			throw new NotFoundHttpException( "Page '$pageName' not found." );
+	function($pageName) use ($ffFactory) {
+		if (!$ffFactory->getTemplateNameValidator()->validate($pageName . '.html.twig')->isSuccessful()) {
+			throw new NotFoundHttpException("Page '$pageName' not found.");
 		}
 
-		return $ffFactory->getLayoutTemplate( 'Display_Page_Layout.twig' )->render( [
+		return $ffFactory->getLayoutTemplate('Display_Page_Layout.twig')->render([
 			'main_template' => $pageName . '.html.twig'
-		] );
+		]);
 	}
 )
-->bind( 'page' );
+->bind('page');
 
 // Form for this is provided by route page/Subscription_Form
 $app->match(
 	'contact/subscribe',
-	function( Application $app, Request $request ) use ( $ffFactory ) {
-		return ( new AddSubscriptionHandler( $ffFactory, $app ) )
-			->handle( $request );
+	function(Application $app, Request $request) use ($ffFactory) {
+		return (new AddSubscriptionHandler($ffFactory, $app))
+			->handle($request);
 	}
 )
-->method( 'GET|POST' )
-->bind( 'subscribe' );
+->method('GET|POST')
+->bind('subscribe');
 
-$app->get( 'contact/confirm-subscription/{confirmationCode}', function ( $confirmationCode ) use ( $ffFactory ) {
+$app->get('contact/confirm-subscription/{confirmationCode}', function($confirmationCode) use ($ffFactory) {
 	$useCase = $ffFactory->newConfirmSubscriptionUseCase();
-	$response = $useCase->confirmSubscription( $confirmationCode );
-	return $ffFactory->newConfirmSubscriptionHtmlPresenter()->present( $response );
+	$response = $useCase->confirmSubscription($confirmationCode);
+	return $ffFactory->newConfirmSubscriptionHtmlPresenter()->present($response);
 } )
-->assert( 'confirmationCode', '^[0-9a-f]+$' )
-->bind( 'confirm-subscription' );
+->assert('confirmationCode', '^[0-9a-f]+$')
+->bind('confirm-subscription');
 
 $app->get(
 	'check-iban',
-	function( Request $request ) use ( $app, $ffFactory ) {
+	function(Request $request) use ($app, $ffFactory) {
 		$useCase = $ffFactory->newCheckIbanUseCase();
-		$checkIbanResponse = $useCase->checkIban( new Iban( $request->query->get( 'iban', '' ) ) );
-		return $app->json( $ffFactory->newIbanPresenter()->present( $checkIbanResponse ) );
+		$checkIbanResponse = $useCase->checkIban(new Iban($request->query->get('iban', '')));
+		return $app->json($ffFactory->newIbanPresenter()->present($checkIbanResponse));
 	}
 );
 
 $app->get(
 	'generate-iban',
-	function( Request $request ) use ( $app, $ffFactory ) {
+	function(Request $request) use ($app, $ffFactory) {
 		$generateIbanRequest = new GenerateIbanRequest(
-			$request->query->get( 'accountNumber', '' ),
-			$request->query->get( 'bankCode', '' )
+			$request->query->get('accountNumber', ''),
+			$request->query->get('bankCode', '')
 		);
 
-		$generateIbanResponse = $ffFactory->newGenerateIbanUseCase()->generateIban( $generateIbanRequest );
-		return $app->json( $ffFactory->newIbanPresenter()->present( $generateIbanResponse ) );
+		$generateIbanResponse = $ffFactory->newGenerateIbanUseCase()->generateIban($generateIbanRequest);
+		return $app->json($ffFactory->newIbanPresenter()->present($generateIbanResponse));
 	}
 );
 
 $app->post(
 	'add-comment',
-	function( Request $request ) use ( $app, $ffFactory ) {
+	function(Request $request) use ($app, $ffFactory) {
 		$addCommentRequest = new AddCommentRequest();
-		$addCommentRequest->setCommentText( trim( $request->request->get( 'kommentar', '' ) ) );
-		$addCommentRequest->setIsPublic( $request->request->get( 'public', '0' ) === '1' );
-		$addCommentRequest->setAuthorDisplayName( trim( $request->request->get( 'eintrag', '' ) ) );
-		$addCommentRequest->setDonationId( (int)$request->request->get( 'sid', '' ) );
+		$addCommentRequest->setCommentText(trim($request->request->get('kommentar', '')));
+		$addCommentRequest->setIsPublic($request->request->get('public', '0') === '1');
+		$addCommentRequest->setAuthorDisplayName(trim($request->request->get('eintrag', '')));
+		$addCommentRequest->setDonationId((int)$request->request->get('sid', ''));
 		$addCommentRequest->freeze()->assertNoNullFields();
 
-		$updateToken = $request->request->get( 'utoken', '' );
+		$updateToken = $request->request->get('utoken', '');
 
-		if ( $updateToken === '' ) {
-			return $app->json( [
+		if ($updateToken === '') {
+			return $app->json([
 				'status' => 'ERR',
-				'message' => $ffFactory->getTranslator()->trans( 'comment_failure_access_denied' ),
-			] );
+				'message' => $ffFactory->getTranslator()->trans('comment_failure_access_denied'),
+			]);
 		}
 
-		$response = $ffFactory->newAddCommentUseCase( $updateToken )->addComment( $addCommentRequest );
+		$response = $ffFactory->newAddCommentUseCase($updateToken)->addComment($addCommentRequest);
 
-		if ( $response->isSuccessful() ) {
-			return $app->json( [
+		if ($response->isSuccessful()) {
+			return $app->json([
 				'status' => 'OK',
-				'message' => $ffFactory->getTranslator()->trans( $response->getSuccessMessage() ),
-			] );
+				'message' => $ffFactory->getTranslator()->trans($response->getSuccessMessage()),
+			]);
 		}
 
-		return $app->json( [
+		return $app->json([
 			'status' => 'ERR',
-			'message' => $ffFactory->getTranslator()->trans( $response->getErrorMessage() ),
-		] );
+			'message' => $ffFactory->getTranslator()->trans($response->getErrorMessage()),
+		]);
 	}
 );
 
 $app->post(
 	'contact/get-in-touch',
-	function( Request $request ) use ( $app, $ffFactory ) {
+	function(Request $request) use ($app, $ffFactory) {
 		$contactFormRequest = new GetInTouchRequest(
-			$request->get( 'firstname', '' ),
-			$request->get( 'lastname', '' ),
-			$request->get( 'email', '' ),
-			$request->get( 'subject', '' ),
-			$request->get( 'messageBody', '' )
+			$request->get('firstname', ''),
+			$request->get('lastname', ''),
+			$request->get('email', ''),
+			$request->get('subject', ''),
+			$request->get('messageBody', '')
 		);
 
-		$contactFormResponse = $ffFactory->newGetInTouchUseCase()->processContactRequest( $contactFormRequest );
-		if ( $contactFormResponse->isSuccessful() ) {
-			return $app->redirect( $app['url_generator']->generate( 'page', [ 'pageName' => 'Kontakt_Bestaetigung' ] ) );
+		$contactFormResponse = $ffFactory->newGetInTouchUseCase()->processContactRequest($contactFormRequest);
+		if ($contactFormResponse->isSuccessful()) {
+			return $app->redirect($app['url_generator']->generate('page', ['pageName' => 'Kontakt_Bestaetigung']));
 		}
-		return $ffFactory->newGetInTouchHtmlPresenter()->present( $contactFormResponse, $request->request->all() );
+		return $ffFactory->newGetInTouchHtmlPresenter()->present($contactFormResponse, $request->request->all());
 	}
 );
 
 $app->post(
 	'donation/cancel',
-	function( Request $request ) use ( $app, $ffFactory ) {
+	function(Request $request) use ($app, $ffFactory) {
 		$cancellationRequest = new CancelDonationRequest(
-			(int)$request->request->get( 'sid', '' )
+			(int)$request->request->get('sid', '')
 		);
 
-		$responseModel = $ffFactory->newCancelDonationUseCase( $request->request->get( 'utoken', '' ) )
-			->cancelDonation( $cancellationRequest );
+		$responseModel = $ffFactory->newCancelDonationUseCase($request->request->get('utoken', ''))
+			->cancelDonation($cancellationRequest);
 
-		$httpResponse = new Response( $ffFactory->newCancelDonationHtmlPresenter()->present( $responseModel ) );
-		if ( $responseModel->cancellationSucceeded() ) {
-			$httpResponse->headers->clearCookie( 'donation_timestamp' );
+		$httpResponse = new Response($ffFactory->newCancelDonationHtmlPresenter()->present($responseModel));
+		if ($responseModel->cancellationSucceeded()) {
+			$httpResponse->headers->clearCookie('donation_timestamp');
 		}
 
 		return $httpResponse;
@@ -341,151 +341,151 @@ 
 
 $app->post(
 	'donation/add',
-	function( Application $app, Request $request ) use ( $ffFactory ) {
-		return ( new AddDonationHandler( $ffFactory, $app ) )
-			->handle( $request );
+	function(Application $app, Request $request) use ($ffFactory) {
+		return (new AddDonationHandler($ffFactory, $app))
+			->handle($request);
 	}
 );
 
 // Show a donation form with pre-filled payment values, e.g. when coming from a banner
-$app->get( 'donation/new', function ( Request $request ) use ( $ffFactory ) {
+$app->get('donation/new', function(Request $request) use ($ffFactory) {
 	try {
-		$amount = Euro::newFromFloat( ( new AmountParser( 'en_EN' ) )->parseAsFloat(
-			$request->get( 'betrag_auswahl', $request->get( 'amountGiven', '' ) ) )
+		$amount = Euro::newFromFloat((new AmountParser('en_EN'))->parseAsFloat(
+			$request->get('betrag_auswahl', $request->get('amountGiven', '')) )
 		);
-	} catch ( \InvalidArgumentException $ex ) {
-		$amount = Euro::newFromCents( 0 );
+	} catch (\InvalidArgumentException $ex) {
+		$amount = Euro::newFromCents(0);
 	}
-	$validationResult = $ffFactory->newPaymentDataValidator()->validate( $amount, (string) $request->get( 'zahlweise', '' ) );
+	$validationResult = $ffFactory->newPaymentDataValidator()->validate($amount, (string)$request->get('zahlweise', ''));
 
 	$trackingInfo = new DonationTrackingInfo();
-	$trackingInfo->setTotalImpressionCount( intval( $request->get( 'impCount' ) ) );
-	$trackingInfo->setSingleBannerImpressionCount( intval( $request->get( 'bImpCount' ) ) );
+	$trackingInfo->setTotalImpressionCount(intval($request->get('impCount')));
+	$trackingInfo->setSingleBannerImpressionCount(intval($request->get('bImpCount')));
 
 	// TODO: don't we want to use newDonationFormViolationPresenter when !$validationResult->isSuccessful()?
 
 	return new Response(
 		$ffFactory->newDonationFormPresenter()->present(
 			$amount,
-			$request->get( 'zahlweise', '' ),
-			intval( $request->get( 'periode', 0 ) ),
+			$request->get('zahlweise', ''),
+			intval($request->get('periode', 0)),
 			$validationResult->isSuccessful(),
 			$trackingInfo,
-			$request->get( 'addressType', 'person' )
+			$request->get('addressType', 'person')
 		)
 	);
-} )->method( 'POST|GET' );
+} )->method('POST|GET');
 
 $app->post(
 	'apply-for-membership',
-	function( Application $app, Request $httpRequest ) use ( $ffFactory ) {
-		return ( new ApplyForMembershipHandler( $ffFactory, $app ) )->handle( $httpRequest );
+	function(Application $app, Request $httpRequest) use ($ffFactory) {
+		return (new ApplyForMembershipHandler($ffFactory, $app))->handle($httpRequest);
 	}
 );
 
 $app->get(
 	'show-membership-confirmation',
-	function( Request $request ) use ( $ffFactory ) {
-		$confirmationRequest = new ShowMembershipAppConfirmationRequest( (int)$request->query->get( 'id', 0 ) );
+	function(Request $request) use ($ffFactory) {
+		$confirmationRequest = new ShowMembershipAppConfirmationRequest((int)$request->query->get('id', 0));
 
 		return $ffFactory->newMembershipApplicationConfirmationHtmlPresenter()->present(
-			$ffFactory->newMembershipApplicationConfirmationUseCase( $request->query->get( 'accessToken', '' ) )
-				->showConfirmation( $confirmationRequest )
+			$ffFactory->newMembershipApplicationConfirmationUseCase($request->query->get('accessToken', ''))
+				->showConfirmation($confirmationRequest)
 		);
 	}
-)->bind( 'show-membership-confirmation' );
+)->bind('show-membership-confirmation');
 
 $app->get(
 	'cancel-membership-application',
-	function( Request $request ) use ( $ffFactory ) {
+	function(Request $request) use ($ffFactory) {
 		$cancellationRequest = new CancellationRequest(
-			(int)$request->query->get( 'id', '' )
+			(int)$request->query->get('id', '')
 		);
 
 		return $ffFactory->newCancelMembershipApplicationHtmlPresenter()->present(
-			$ffFactory->newCancelMembershipApplicationUseCase( $request->query->get( 'updateToken', '' ) )
-				->cancelApplication( $cancellationRequest )
+			$ffFactory->newCancelMembershipApplicationUseCase($request->query->get('updateToken', ''))
+				->cancelApplication($cancellationRequest)
 		);
 	}
 );
 
 $app->match(
 	'show-donation-confirmation',
-	function( Application $app, Request $request ) use ( $ffFactory ) {
-		return ( new ShowDonationConfirmationHandler( $ffFactory ) )->handle(
+	function(Application $app, Request $request) use ($ffFactory) {
+		return (new ShowDonationConfirmationHandler($ffFactory))->handle(
 			$request,
-			$app['session']->get( 'piwikTracking', [] )
+			$app['session']->get('piwikTracking', [])
 		);
 	}
-)->bind( 'show-donation-confirmation' )
-->method( 'GET|POST' );
+)->bind('show-donation-confirmation')
+->method('GET|POST');
 
 $app->post(
 	'handle-paypal-payment-notification',
-	function ( Request $request ) use ( $ffFactory ) {
-		return ( new PayPalNotificationHandler( $ffFactory ) )->handle( $request );
+	function(Request $request) use ($ffFactory) {
+		return (new PayPalNotificationHandler($ffFactory))->handle($request);
 	}
 );
 
 $app->get(
 	'handle-creditcard-payment-notification',
-	function ( Request $request ) use ( $ffFactory ) {
+	function(Request $request) use ($ffFactory) {
 		try {
-			$ffFactory->newCreditCardNotificationUseCase( $request->query->get( 'utoken', '' ) )
+			$ffFactory->newCreditCardNotificationUseCase($request->query->get('utoken', ''))
 				->handleNotification(
-					( new CreditCardPaymentNotificationRequest() )
-						->setTransactionId( $request->query->get( 'transactionId', '' ) )
-						->setDonationId( (int)$request->query->get( 'donation_id', '' ) )
-						->setAmount( Euro::newFromCents( (int)$request->query->get( 'amount' ) ) )
-						->setCustomerId( $request->query->get( 'customerId', '' ) )
-						->setSessionId( $request->query->get( 'sessionId', '' ) )
-						->setAuthId( $request->query->get(  'auth', '' ) )
-						->setTitle( $request->query->get( 'title', '' ) )
-						->setCountry( $request->query->get( 'country', '' ) )
-						->setCurrency( $request->query->get( 'currency', '' ) )
+					(new CreditCardPaymentNotificationRequest())
+						->setTransactionId($request->query->get('transactionId', ''))
+						->setDonationId((int)$request->query->get('donation_id', ''))
+						->setAmount(Euro::newFromCents((int)$request->query->get('amount')))
+						->setCustomerId($request->query->get('customerId', ''))
+						->setSessionId($request->query->get('sessionId', ''))
+						->setAuthId($request->query->get('auth', ''))
+						->setTitle($request->query->get('title', ''))
+						->setCountry($request->query->get('country', ''))
+						->setCurrency($request->query->get('currency', ''))
 				);
 
 			$response = CreditCardNotificationResponse::newSuccessResponse(
-				(int)$request->query->get( 'donation_id', '' ),
-				$request->query->get( 'token', '' )
+				(int)$request->query->get('donation_id', ''),
+				$request->query->get('token', '')
  			);
-		} catch ( CreditCardPaymentHandlerException $e ) {
-			$response = CreditCardNotificationResponse::newFailureResponse( $e->getMessage() );
+		} catch (CreditCardPaymentHandlerException $e) {
+			$response = CreditCardNotificationResponse::newFailureResponse($e->getMessage());
 		}
 
-		return new Response( $ffFactory->newCreditCardNotificationPresenter()->present( $response ) );
+		return new Response($ffFactory->newCreditCardNotificationPresenter()->present($response));
 	}
 );
 
 $app->get(
 	'donation-accepted',
-	function( Request $request ) use ( $app, $ffFactory ) {
+	function(Request $request) use ($app, $ffFactory) {
 
-		$eventHandler = $ffFactory->newDonationAcceptedEventHandler( $request->query->get( 'update_token', '' ) );
-		$result = $eventHandler->onDonationAccepted( (int)$request->query->get( 'donation_id', '' ) );
+		$eventHandler = $ffFactory->newDonationAcceptedEventHandler($request->query->get('update_token', ''));
+		$result = $eventHandler->onDonationAccepted((int)$request->query->get('donation_id', ''));
 
 		return $app->json(
-			$result === null ? [ 'status' => 'OK' ] : [ 'status' => 'ERR', 'message' => $result ]
+			$result === null ? ['status' => 'OK'] : ['status' => 'ERR', 'message' => $result]
 		);
 	}
 );
 
 $app->post(
 	'handle-paypal-membership-fee-payments',
-	function ( Request $request ) use ( $ffFactory ) {
-		return ( new PayPalNotificationHandlerForMembershipFee( $ffFactory ) )->handle( $request->request );
+	function(Request $request) use ($ffFactory) {
+		return (new PayPalNotificationHandlerForMembershipFee($ffFactory))->handle($request->request);
 	}
 );
 
-$app->get( '/', function ( Application $app, Request $request ) {
-	$app['session']->set( 'piwikTracking', array_filter(
+$app->get('/', function(Application $app, Request $request) {
+	$app['session']->set('piwikTracking', array_filter(
 			[
-				'paymentType' => $request->get( 'zahlweise', '' ),
-				'paymentAmount' => $request->get( 'betrag', '' ),
-				'paymentInterval' => $request->get( 'periode', '' )
+				'paymentType' => $request->get('zahlweise', ''),
+				'paymentAmount' => $request->get('betrag', ''),
+				'paymentInterval' => $request->get('periode', '')
 			],
-			function ( string $value ) {
-				return $value !== '' && strlen( $value ) < 20;
+			function(string $value) {
+				return $value !== '' && strlen($value) < 20;
 			} )
 	);
 
@@ -500,43 +500,43 @@ 
 		),
 		HttpKernelInterface::SUB_REQUEST
 	);
-} )->bind( '/' );
+} )->bind('/');
 
 // TODO Figure out how to rewrite with Nginx
 // See https://serverfault.com/questions/805881/nginx-populate-request-uri-with-rewritten-url
 $app->post(
 	'/spenden/paypal_handler.php',
-	function ( Request $request ) use ( $ffFactory ) {
-		return ( new PayPalNotificationHandler( $ffFactory ) )->handle( $request );
+	function(Request $request) use ($ffFactory) {
+		return (new PayPalNotificationHandler($ffFactory))->handle($request);
 	}
 );
 
 // redirect display page requests from old URLs
-$app->get( '/spenden/{page}', function( Application $app, Request $request, string $page ) {
+$app->get('/spenden/{page}', function(Application $app, Request $request, string $page) {
 	// Poor man's rewrite until someone has figured out how to do this with Nginx without breaking REQUEST_URI
 	// See https://serverfault.com/questions/805881/nginx-populate-request-uri-with-rewritten-url
-	switch ( $page ) {
+	switch ($page) {
 		case 'Mitgliedschaft':
-			return ( new RouteRedirectionHandler( $app, $request->getQueryString() ) )->handle( '/page/Membership_Application' );
+			return (new RouteRedirectionHandler($app, $request->getQueryString()))->handle('/page/Membership_Application');
 		default:
-			return ( new RouteRedirectionHandler( $app, $request->getQueryString() ) )->handle( '/page/' . $page );
+			return (new RouteRedirectionHandler($app, $request->getQueryString()))->handle('/page/' . $page);
 	}
-} )->assert( 'page', '[a-zA-Z_\-\s\x7f-\xff]+' );
+} )->assert('page', '[a-zA-Z_\-\s\x7f-\xff]+');
 
 // redirect different formats of comment lists
-$app->get( '/spenden/{outputFormat}.php', function( Application $app, Request $request, string $outputFormat ) {
-	return ( new RouteRedirectionHandler( $app, $request->getQueryString() ) )->handle(
-		'/list-comments.' . ( $outputFormat === 'list' ? 'html' : $outputFormat )
+$app->get('/spenden/{outputFormat}.php', function(Application $app, Request $request, string $outputFormat) {
+	return (new RouteRedirectionHandler($app, $request->getQueryString()))->handle(
+		'/list-comments.' . ($outputFormat === 'list' ? 'html' : $outputFormat)
 	);
-} )->assert( 'outputFormat', 'list|rss|json' );
+} )->assert('outputFormat', 'list|rss|json');
 
 // redirect all other calls to default route
-$app->get( '/spenden{page}', function( Application $app, Request $request ) {
-	return ( new RouteRedirectionHandler( $app, $request->getQueryString() ) )->handle( '/' );
-} )->assert( 'page', '/?([a-z]+\.php)?' );
+$app->get('/spenden{page}', function(Application $app, Request $request) {
+	return (new RouteRedirectionHandler($app, $request->getQueryString()))->handle('/');
+} )->assert('page', '/?([a-z]+\.php)?');
 
-$app->get( '/purge-cache', function( Request $request ) use ( $ffFactory ) {
-	$response = $ffFactory->newAuthorizedCachePurger()->purgeCache( $request->query->get( 'secret', '' ) );
+$app->get('/purge-cache', function(Request $request) use ($ffFactory) {
+	$response = $ffFactory->newAuthorizedCachePurger()->purgeCache($request->query->get('secret', ''));
 
 	return new Response(
 		[
@@ -547,7 +547,7 @@ 
 	);
 } );
 
-$app->get( 'status', function() {
+$app->get('status', function() {
 	return 'Status: OK (Online)';
 } );
 

app/bootstrap.php

Spacing +46 added lines, -46 removed lines

@@ -6,7 +6,7 @@ 
  * @var \WMDE\Fundraising\Frontend\Factories\FunFunFactory $ffFactory
  */
 
-declare( strict_types = 1 );
+declare(strict_types = 1);
 
 use Silex\Application;
 use Silex\Provider\RoutingServiceProvider;
@@ -21,101 +21,101 @@ 
 
 $app = new Application();
 
-$app->register( new SessionServiceProvider() );
-$app->register( new RoutingServiceProvider() );
-$app->register( new TwigServiceProvider() );
+$app->register(new SessionServiceProvider());
+$app->register(new RoutingServiceProvider());
+$app->register(new TwigServiceProvider());
 
 $app->before(
-	function ( Request $request, Application $app ) {
-		$app['request_stack.is_json'] = in_array( 'application/json', $request->getAcceptableContentTypes() );
+	function(Request $request, Application $app) {
+		$app['request_stack.is_json'] = in_array('application/json', $request->getAcceptableContentTypes());
 
-		$request->attributes->set( 'trackingCode', TrackingDataSelector::getFirstNonEmptyValue( [
-			$request->cookies->get( 'spenden_tracking' ),
-			$request->request->get( 'tracking' ),
+		$request->attributes->set('trackingCode', TrackingDataSelector::getFirstNonEmptyValue([
+			$request->cookies->get('spenden_tracking'),
+			$request->request->get('tracking'),
 			TrackingDataSelector::concatTrackingFromVarTuple(
-				$request->get( 'piwik_campaign', '' ),
-				$request->get( 'piwik_kwd', '' )
+				$request->get('piwik_campaign', ''),
+				$request->get('piwik_kwd', '')
 			)
-		] ) );
+		]));
 
-		$request->attributes->set( 'trackingSource', TrackingDataSelector::getFirstNonEmptyValue( [
-			$request->cookies->get( 'spenden_source' ),
-			$request->request->get( 'source' ),
-			$request->server->get( 'HTTP_REFERER' )
-		] ) );
+		$request->attributes->set('trackingSource', TrackingDataSelector::getFirstNonEmptyValue([
+			$request->cookies->get('spenden_source'),
+			$request->request->get('source'),
+			$request->server->get('HTTP_REFERER')
+		]));
 	},
 	Application::EARLY_EVENT
 );
 
-$app->before( function( Request $request ) {
-	foreach ( [ $request->request, $request->query ] as $parameterBag ) {
-		foreach ( $parameterBag->keys() as $key ) {
-			if ( is_string( $parameterBag->get( $key ) ) ) {
-				$parameterBag->set( $key, trim( $parameterBag->get( $key ) ) );
+$app->before(function(Request $request) {
+	foreach ([$request->request, $request->query] as $parameterBag) {
+		foreach ($parameterBag->keys() as $key) {
+			if (is_string($parameterBag->get($key))) {
+				$parameterBag->set($key, trim($parameterBag->get($key)));
 			}
 		}
 	}
-}, Application::EARLY_EVENT );
+}, Application::EARLY_EVENT);
 
 
-$app->after( function( Request $request, Response $response, Application $app ) {
-	if( $response instanceof JsonResponse ) {
-		$response->setEncodingOptions( JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES );
+$app->after(function(Request $request, Response $response, Application $app) {
+	if ($response instanceof JsonResponse) {
+		$response->setEncodingOptions(JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
 	}
 
 	// Set cookie with original tracking data
-	if ( (string)$request->cookies->get( 'spenden_tracking' ) === '' &&
-			(string)$request->get( 'piwik_campaign' ) !== '' && (string)$request->get( 'piwik_kwd' ) !== '' ) {
-		$response->headers->setCookie( new \Symfony\Component\HttpFoundation\Cookie(
+	if ((string)$request->cookies->get('spenden_tracking') === '' &&
+			(string)$request->get('piwik_campaign') !== '' && (string)$request->get('piwik_kwd') !== '') {
+		$response->headers->setCookie(new \Symfony\Component\HttpFoundation\Cookie(
 			'spenden_tracking',
-			$request->get( 'piwik_campaign' ) . '/' . $request->get( 'piwik_kwd' )
-		) );
+			$request->get('piwik_campaign') . '/' . $request->get('piwik_kwd')
+		));
 	}
 
 	return $response;
 } );
 
-$app->error( function ( AccessDeniedException $e ) use ( $ffFactory ) {
+$app->error(function(AccessDeniedException $e) use ($ffFactory) {
 	return new Response(
-		$ffFactory->newAccessDeniedHtmlPresenter()->present( $e ),
+		$ffFactory->newAccessDeniedHtmlPresenter()->present($e),
 		403,
-		[ 'X-Status-Code' => 403 ]
+		['X-Status-Code' => 403]
 	);
 } );
 
-$app->error( function ( NotFoundHttpException $e ) use ( $ffFactory, $app ) {
-	if ( $app['request_stack.is_json'] ) {
-		return $app->json( [ 'ERR' => $e->getMessage() ], 404, [ 'X-Status-Code' => 404 ] );
+$app->error(function(NotFoundHttpException $e) use ($ffFactory, $app) {
+	if ($app['request_stack.is_json']) {
+		return $app->json(['ERR' => $e->getMessage()], 404, ['X-Status-Code' => 404]);
 	}
 
 	return new Response(
 		$ffFactory->newPageNotFoundHtmlPresenter()->present(),
 		404,
-		[ 'X-Status-Code' => 404 ]
+		['X-Status-Code' => 404]
 	);
 } );
 
 
-$app->error( function ( \Exception $e, Request $request, $code ) use ( $ffFactory, $app ) {
-	if ( $app['debug'] ) {
+$app->error(function(\Exception $e, Request $request, $code) use ($ffFactory, $app) {
+	if ($app['debug']) {
 		throw $e;
 	}
 
-	$ffFactory->getLogger()->error( $e->getMessage(), [
+	$ffFactory->getLogger()->error($e->getMessage(), [
 		'code' => $e->getCode(),
 		'file' => $e->getFile(),
 		'line' => $e->getLine(),
 		'stack_trace' => $e->getTraceAsString()
-	] );
+	]);
 
-	if ( $app['request_stack.is_json'] ) {
-		return $app->json( [
+	if ($app['request_stack.is_json']) {
+		return $app->json([
 			'ERR' => $e->getMessage()
-		] );
+		]);
 	}
 
 	return new Response(
-		$ffFactory->newInternalErrorHtmlPresenter()->present( $e ),
+		$ffFactory->newInternalErrorHtmlPresenter()->present($e),
 		$code
 	);
 } );

contexts/DonationContext/src/UseCases/HandlePayPalPaymentNotification/HandlePayPalPaymentNotificationUseCase.php

Spacing +96 added lines, -96 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types = 1);
 
 namespace WMDE\Fundraising\Frontend\DonationContext\UseCases\HandlePayPalPaymentNotification;
 
@@ -34,173 +34,173 @@ 
 	private $mailer;
 	private $donationEventLogger;
 
-	public function __construct( DonationRepository $repository, DonationAuthorizer $authorizationService,
-								 DonationConfirmationMailer $mailer, DonationEventLogger $donationEventLogger ) {
+	public function __construct(DonationRepository $repository, DonationAuthorizer $authorizationService,
+								 DonationConfirmationMailer $mailer, DonationEventLogger $donationEventLogger) {
 		$this->repository = $repository;
 		$this->authorizationService = $authorizationService;
 		$this->mailer = $mailer;
 		$this->donationEventLogger = $donationEventLogger;
 	}
 
-	public function handleNotification( PayPalPaymentNotificationRequest $request ): PaypalNotificationResponse {
-		if ( !$request->isSuccessfulPaymentNotification() ) {
-			return $this->createUnhandledResponse( 'Unhandled PayPal instant payment notification' );
+	public function handleNotification(PayPalPaymentNotificationRequest $request): PaypalNotificationResponse {
+		if (!$request->isSuccessfulPaymentNotification()) {
+			return $this->createUnhandledResponse('Unhandled PayPal instant payment notification');
 		}
 
-		if ( $this->isSubscriptionRelatedNonPaymentTransaction( $request ) ) {
-			return $this->createUnhandledResponse( 'Unhandled PayPal subscription notification' );
+		if ($this->isSubscriptionRelatedNonPaymentTransaction($request)) {
+			return $this->createUnhandledResponse('Unhandled PayPal subscription notification');
 		}
 
 		try {
-			$donation = $this->repository->getDonationById( $request->getInternalId() );
-		} catch ( GetDonationException $ex ) {
-			return $this->createErrorResponse( $ex );
+			$donation = $this->repository->getDonationById($request->getInternalId());
+		} catch (GetDonationException $ex) {
+			return $this->createErrorResponse($ex);
 		}
 
-		if ( $donation === null ) {
-			return $this->handleRequestWithoutDonation( $request );
+		if ($donation === null) {
+			return $this->handleRequestWithoutDonation($request);
 		}
 
-		return $this->handleRequestForDonation( $request, $donation );
+		return $this->handleRequestForDonation($request, $donation);
 	}
 
-	private function handleRequestWithoutDonation( PayPalPaymentNotificationRequest $request ): PaypalNotificationResponse {
-		$donation = $this->newDonationFromRequest( $request );
+	private function handleRequestWithoutDonation(PayPalPaymentNotificationRequest $request): PaypalNotificationResponse {
+		$donation = $this->newDonationFromRequest($request);
 
 		try {
-			$this->repository->storeDonation( $donation );
-		} catch ( StoreDonationException $ex ) {
-			return $this->createErrorResponse( $ex );
+			$this->repository->storeDonation($donation);
+		} catch (StoreDonationException $ex) {
+			return $this->createErrorResponse($ex);
 		}
 
-		$this->sendConfirmationEmailFor( $donation );
-		$this->donationEventLogger->log( $donation->getId(), 'paypal_handler: booked' );
+		$this->sendConfirmationEmailFor($donation);
+		$this->donationEventLogger->log($donation->getId(), 'paypal_handler: booked');
 
 		return PaypalNotificationResponse::newSuccessResponse();
 	}
 
-	private function handleRequestForDonation( PayPalPaymentNotificationRequest $request, Donation $donation ): PaypalNotificationResponse {
-		if ( !( $donation->getPayment()->getPaymentMethod() instanceof PayPalPayment ) ) {
-			return $this->createUnhandledResponse( 'Trying to handle IPN for non-Paypal donation' );
+	private function handleRequestForDonation(PayPalPaymentNotificationRequest $request, Donation $donation): PaypalNotificationResponse {
+		if (!($donation->getPayment()->getPaymentMethod() instanceof PayPalPayment)) {
+			return $this->createUnhandledResponse('Trying to handle IPN for non-Paypal donation');
 		}
 
-		if ( !$this->authorizationService->systemCanModifyDonation( $request->getInternalId() ) ) {
-			return $this->createUnhandledResponse( 'Wrong access code for donation' );
+		if (!$this->authorizationService->systemCanModifyDonation($request->getInternalId())) {
+			return $this->createUnhandledResponse('Wrong access code for donation');
 		}
-		if ( $this->donationWasBookedWithDifferentTransactionId( $donation, $request ) ) {
-			return $this->createChildDonation( $donation, $request );
+		if ($this->donationWasBookedWithDifferentTransactionId($donation, $request)) {
+			return $this->createChildDonation($donation, $request);
 		}
 
-		$donation->addPayPalData( $this->newPayPalDataFromRequest( $request ) );
+		$donation->addPayPalData($this->newPayPalDataFromRequest($request));
 
 		try {
 			$donation->confirmBooked();
-		} catch ( \RuntimeException $ex ) {
-			return $this->createErrorResponse( $ex );
+		} catch (\RuntimeException $ex) {
+			return $this->createErrorResponse($ex);
 		}
 
 		try {
-			$this->repository->storeDonation( $donation );
+			$this->repository->storeDonation($donation);
 		}
-		catch ( StoreDonationException $ex ) {
-			return $this->createErrorResponse( $ex );
+		catch (StoreDonationException $ex) {
+			return $this->createErrorResponse($ex);
 		}
 
-		$this->sendConfirmationEmailFor( $donation );
-		$this->donationEventLogger->log( $donation->getId(), 'paypal_handler: booked' );
+		$this->sendConfirmationEmailFor($donation);
+		$this->donationEventLogger->log($donation->getId(), 'paypal_handler: booked');
 
 		return PaypalNotificationResponse::newSuccessResponse();
 	}
 
-	private function createUnhandledResponse( string $reason ): PaypalNotificationResponse {
-		return PaypalNotificationResponse::newUnhandledResponse( [
+	private function createUnhandledResponse(string $reason): PaypalNotificationResponse {
+		return PaypalNotificationResponse::newUnhandledResponse([
 			'message' => $reason
-		] );
+		]);
 	}
 
-	private function sendConfirmationEmailFor( Donation $donation ) {
-		if ( $donation->getDonor() !== null ) {
+	private function sendConfirmationEmailFor(Donation $donation) {
+		if ($donation->getDonor() !== null) {
 			try {
-				$this->mailer->sendConfirmationMailFor( $donation );
-			} catch ( \RuntimeException $ex ) {
+				$this->mailer->sendConfirmationMailFor($donation);
+			} catch (\RuntimeException $ex) {
 				// no need to re-throw or return false, this is not a fatal error, only a minor inconvenience
 			}
 		}
 	}
 
-	private function isSubscriptionRelatedNonPaymentTransaction( PayPalPaymentNotificationRequest $request ): bool {
+	private function isSubscriptionRelatedNonPaymentTransaction(PayPalPaymentNotificationRequest $request): bool {
 		return $request->isForRecurringPayment() && !$request->isRecurringPaymentCompletion();
 	}
 
-	private function newPayPalDataFromRequest( PayPalPaymentNotificationRequest $request ): PayPalData {
-		return ( new PayPalData() )
-			->setPayerId( $request->getPayerId() )
-			->setSubscriberId( $request->getSubscriptionId() )
-			->setPayerStatus( $request->getPayerStatus() )
-			->setAddressStatus( $request->getPayerAddressStatus() )
-			->setAmount( $request->getAmountGross() )
-			->setCurrencyCode( $request->getCurrencyCode() )
-			->setFee( Euro::newFromString( $request->getTransactionFee() ) )
-			->setSettleAmount( $request->getSettleAmount() )
-			->setFirstName( $request->getPayerFirstName() )
-			->setLastName( $request->getPayerLastName() )
-			->setAddressName( $request->getPayerAddressName() )
-			->setPaymentId( $request->getTransactionId() )
-			->setPaymentType( $request->getPaymentType() )
-			->setPaymentStatus( implode( '/', [ $request->getPaymentStatus(), $request->getTransactionType() ] ) )
-			->setPaymentTimestamp( $request->getPaymentTimestamp() );
+	private function newPayPalDataFromRequest(PayPalPaymentNotificationRequest $request): PayPalData {
+		return (new PayPalData())
+			->setPayerId($request->getPayerId())
+			->setSubscriberId($request->getSubscriptionId())
+			->setPayerStatus($request->getPayerStatus())
+			->setAddressStatus($request->getPayerAddressStatus())
+			->setAmount($request->getAmountGross())
+			->setCurrencyCode($request->getCurrencyCode())
+			->setFee(Euro::newFromString($request->getTransactionFee()))
+			->setSettleAmount($request->getSettleAmount())
+			->setFirstName($request->getPayerFirstName())
+			->setLastName($request->getPayerLastName())
+			->setAddressName($request->getPayerAddressName())
+			->setPaymentId($request->getTransactionId())
+			->setPaymentType($request->getPaymentType())
+			->setPaymentStatus(implode('/', [$request->getPaymentStatus(), $request->getTransactionType()]))
+			->setPaymentTimestamp($request->getPaymentTimestamp());
 	}
 
-	private function donationWasBookedWithDifferentTransactionId( Donation $donation,
-																  PayPalPaymentNotificationRequest $request ): bool {
+	private function donationWasBookedWithDifferentTransactionId(Donation $donation,
+																  PayPalPaymentNotificationRequest $request): bool {
 		/**
 		 * @var PayPalPayment $payment
 		 */
 		$payment = $donation->getPaymentMethod();
 
-		if ( !$donation->isBooked() ) {
+		if (!$donation->isBooked()) {
 			return false;
 		}
 
-		if ( $request->getTransactionId() === $payment->getPayPalData()->getPaymentId() ) {
+		if ($request->getTransactionId() === $payment->getPayPalData()->getPaymentId()) {
 			return false;
 		}
 
-		if ( $payment->getPayPalData()->hasChildPayment( $request->getTransactionId() ) ) {
+		if ($payment->getPayPalData()->hasChildPayment($request->getTransactionId())) {
 			return false;
 		}
 
 		return true;
 	}
 
-	private function createChildDonation( Donation $donation, PayPalPaymentNotificationRequest $request ): PaypalNotificationResponse {
-		$childPaymentMethod = new PayPalPayment( $this->newPayPalDataFromRequest( $request ) );
+	private function createChildDonation(Donation $donation, PayPalPaymentNotificationRequest $request): PaypalNotificationResponse {
+		$childPaymentMethod = new PayPalPayment($this->newPayPalDataFromRequest($request));
 		$payment = $donation->getPayment();
 		$childDonation = new Donation(
 			null,
 			Donation::STATUS_EXTERNAL_BOOKED,
 			$donation->getDonor(),
-			new DonationPayment( $payment->getAmount(), $payment->getIntervalInMonths(), $childPaymentMethod ),
+			new DonationPayment($payment->getAmount(), $payment->getIntervalInMonths(), $childPaymentMethod),
 			$donation->getOptsIntoNewsletter(), $donation->getTrackingInfo()
 		);
 		try {
-			$this->repository->storeDonation( $childDonation );
-		} catch ( StoreDonationException $ex ) {
-			return $this->createErrorResponse( $ex );
+			$this->repository->storeDonation($childDonation);
+		} catch (StoreDonationException $ex) {
+			return $this->createErrorResponse($ex);
 		}
 		/** @var \WMDE\Fundraising\Frontend\PaymentContext\Domain\Model\PayPalPayment $paymentMethod */
 		$paymentMethod = $payment->getPaymentMethod();
-		$paymentMethod->getPayPalData()->addChildPayment( $request->getTransactionId(), $childDonation->getId() );
+		$paymentMethod->getPayPalData()->addChildPayment($request->getTransactionId(), $childDonation->getId());
 		try {
-			$this->repository->storeDonation( $donation );
-		} catch ( StoreDonationException $ex ) {
-			return $this->createErrorResponse( $ex );
+			$this->repository->storeDonation($donation);
+		} catch (StoreDonationException $ex) {
+			return $this->createErrorResponse($ex);
 		}
-		$this->logChildDonationCreatedEvent( $donation->getId(), $childDonation->getId() );
+		$this->logChildDonationCreatedEvent($donation->getId(), $childDonation->getId());
 		return PaypalNotificationResponse::newSuccessResponse();
 	}
 
-	private function logChildDonationCreatedEvent( $parentId, $childId ) {
+	private function logChildDonationCreatedEvent($parentId, $childId) {
 		$this->donationEventLogger->log(
 			$parentId,
 			"paypal_handler: new transaction id to corresponding child donation: $childId"
@@ -211,51 +211,51 @@ 
 		);
 	}
 
-	private function newDonorFromRequest( PayPalPaymentNotificationRequest $request ): Donor {
+	private function newDonorFromRequest(PayPalPaymentNotificationRequest $request): Donor {
 		return new Donor(
-			$this->newPersonNameFromRequest( $request ),
-			$this->newPhysicalAddressFromRequest( $request ),
+			$this->newPersonNameFromRequest($request),
+			$this->newPhysicalAddressFromRequest($request),
 			$request->getPayerEmail()
 		);
 	}
 
-	private function newPersonNameFromRequest( PayPalPaymentNotificationRequest $request ): DonorName {
+	private function newPersonNameFromRequest(PayPalPaymentNotificationRequest $request): DonorName {
 		$name = DonorName::newPrivatePersonName();
-		$name->setFirstName( $request->getPayerFirstName() );
-		$name->setLastName( $request->getPayerLastName() );
+		$name->setFirstName($request->getPayerFirstName());
+		$name->setLastName($request->getPayerLastName());
 		$name->freeze();
 		return $name;
 	}
 
-	private function newPhysicalAddressFromRequest( PayPalPaymentNotificationRequest $request ): DonorAddress {
+	private function newPhysicalAddressFromRequest(PayPalPaymentNotificationRequest $request): DonorAddress {
 		$address = new DonorAddress();
-		$address->setStreetAddress( $request->getPayerAddressStreet() );
-		$address->setCity( $request->getPayerAddressCity() );
-		$address->setPostalCode( $request->getPayerAddressPostalCode() );
-		$address->setCountryCode( $request->getPayerAddressCountryCode() );
+		$address->setStreetAddress($request->getPayerAddressStreet());
+		$address->setCity($request->getPayerAddressCity());
+		$address->setPostalCode($request->getPayerAddressPostalCode());
+		$address->setCountryCode($request->getPayerAddressCountryCode());
 		$address->freeze();
 		return $address;
 	}
 
-	private function newDonationFromRequest( PayPalPaymentNotificationRequest $request ): Donation {
-		$payment = new DonationPayment( $request->getAmountGross(), 0, new PayPalPayment() );
+	private function newDonationFromRequest(PayPalPaymentNotificationRequest $request): Donation {
+		$payment = new DonationPayment($request->getAmountGross(), 0, new PayPalPayment());
 		$donation = new Donation(
 			null,
 			Donation::STATUS_EXTERNAL_BOOKED,
-			$this->newDonorFromRequest( $request ),
+			$this->newDonorFromRequest($request),
 			$payment,
 			Donation::DOES_NOT_OPT_INTO_NEWSLETTER,
 			DonationTrackingInfo::newBlankTrackingInfo()->freeze()->assertNoNullFields()
 		);
-		$donation->addPayPalData( $this->newPayPalDataFromRequest( $request ) );
+		$donation->addPayPalData($this->newPayPalDataFromRequest($request));
 		return $donation;
 	}
 
-	private function createErrorResponse( \Exception $ex ): PaypalNotificationResponse {
-		return PaypalNotificationResponse::newFailureResponse( [
+	private function createErrorResponse(\Exception $ex): PaypalNotificationResponse {
+		return PaypalNotificationResponse::newFailureResponse([
 			'message' => $ex->getMessage(),
 			'stackTrace' => $ex->getTraceAsString()
-		] );
+		]);
 	}
 
 }

src/Factories/FunFunFactory.php

Spacing +163 added lines, -163 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types = 1);
 
 namespace WMDE\Fundraising\Frontend\Factories;
 
@@ -173,7 +173,7 @@ 
 	 */
 	private $profiler = null;
 
-	public function __construct( array $config ) {
+	public function __construct(array $config) {
 		$this->config = $config;
 		$this->pimple = $this->newPimple();
 	}
@@ -194,15 +194,15 @@ 
 		};
 
 		$pimple['dbal_connection'] = function() {
-			return DriverManager::getConnection( $this->config['db'] );
+			return DriverManager::getConnection($this->config['db']);
 		};
 
 		$pimple['entity_manager'] = function() {
-			$entityManager = ( new StoreFactory( $this->getConnection(), $this->getVarPath() . '/doctrine_proxies' ) )
+			$entityManager = (new StoreFactory($this->getConnection(), $this->getVarPath() . '/doctrine_proxies'))
 				->getEntityManager();
-			if ( $this->addDoctrineSubscribers ) {
-				$entityManager->getEventManager()->addEventSubscriber( $this->newDoctrineDonationPrePersistSubscriber() );
-				$entityManager->getEventManager()->addEventSubscriber( $this->newDoctrineMembershipApplicationPrePersistSubscriber() );
+			if ($this->addDoctrineSubscribers) {
+				$entityManager->getEventManager()->addEventSubscriber($this->newDoctrineDonationPrePersistSubscriber());
+				$entityManager->getEventManager()->addEventSubscriber($this->newDoctrineMembershipApplicationPrePersistSubscriber());
 			}
 
 			return $entityManager;
@@ -210,53 +210,53 @@ 
 
 		$pimple['subscription_repository'] = function() {
 			return new LoggingSubscriptionRepository(
-				new DoctrineSubscriptionRepository( $this->getEntityManager() ),
+				new DoctrineSubscriptionRepository($this->getEntityManager()),
 				$this->getLogger()
 			);
 		};
 
 		$pimple['donation_repository'] = function() {
 			return new LoggingDonationRepository(
-				new DoctrineDonationRepository( $this->getEntityManager() ),
+				new DoctrineDonationRepository($this->getEntityManager()),
 				$this->getLogger()
 			);
 		};
 
 		$pimple['membership_application_repository'] = function() {
 			return new LoggingApplicationRepository(
-				new DoctrineApplicationRepository( $this->getEntityManager() ),
+				new DoctrineApplicationRepository($this->getEntityManager()),
 				$this->getLogger()
 			);
 		};
 
 		$pimple['comment_repository'] = function() {
 			$finder = new LoggingCommentFinder(
-				new DoctrineCommentFinder( $this->getEntityManager() ),
+				new DoctrineCommentFinder($this->getEntityManager()),
 				$this->getLogger()
 			);
 
-			return $this->addProfilingDecorator( $finder, 'CommentFinder' );
+			return $this->addProfilingDecorator($finder, 'CommentFinder');
 		};
 
 		$pimple['mail_validator'] = function() {
-			return new EmailValidator( new InternetDomainNameValidator() );
+			return new EmailValidator(new InternetDomainNameValidator());
 		};
 
 		$pimple['subscription_validator'] = function() {
 			return new SubscriptionValidator(
 				$this->getEmailValidator(),
-				$this->newTextPolicyValidator( 'fields' ),
+				$this->newTextPolicyValidator('fields'),
 				$this->newSubscriptionDuplicateValidator(),
 				$this->newHonorificValidator()
 			);
 		};
 
 		$pimple['template_name_validator'] = function() {
-			return new TemplateNameValidator( $this->getTwig() );
+			return new TemplateNameValidator($this->getTwig());
 		};
 
 		$pimple['contact_validator'] = function() {
-			return new GetInTouchValidator( $this->getEmailValidator() );
+			return new GetInTouchValidator($this->getEmailValidator());
 		};
 
 		$pimple['greeting_generator'] = function() {
@@ -265,18 +265,18 @@ 
 
 		$pimple['guzzle_client'] = function() {
 			$middlewareFactory = new MiddlewareFactory();
-			$middlewareFactory->setLogger( $this->getLogger() );
+			$middlewareFactory->setLogger($this->getLogger());
 
-			$handlerStack = HandlerStack::create( new CurlHandler() );
-			$handlerStack->push( $middlewareFactory->retry() );
+			$handlerStack = HandlerStack::create(new CurlHandler());
+			$handlerStack->push($middlewareFactory->retry());
 
-			$guzzle = new Client( [
+			$guzzle = new Client([
 				'cookies' => true,
 				'handler' => $handlerStack,
-				'headers' => [ 'User-Agent' => 'WMDE Fundraising Frontend' ],
-			] );
+				'headers' => ['User-Agent' => 'WMDE Fundraising Frontend'],
+			]);
 
-			return $this->addProfilingDecorator( $guzzle, 'Guzzle Client' );
+			return $this->addProfilingDecorator($guzzle, 'Guzzle Client');
 		};
 
 		$pimple['translator'] = function() {
@@ -286,27 +286,27 @@ 
 			];
 			$locale = $this->config['locale'];
 			$messagesPath = __DIR__ . '/../../' . $this->config['i18n-base-path'] . '/' . $locale;
-			$translator = $translationFactory->create( $loaders, $locale );
-			$translator->addResource( 'json', $messagesPath . '/messages.json', $locale );
-			$translator->addResource( 'json', $messagesPath . '/paymentTypes.json', $locale, 'paymentTypes' );
-			$translator->addResource( 'json', $messagesPath . '/paymentIntervals.json', $locale, 'paymentIntervals' );
-			$translator->addResource( 'json', $messagesPath . '/paymentStatus.json', $locale, 'paymentStatus' );
-			$translator->addResource( 'json', $messagesPath . '/validations.json', $locale, 'validations' );
+			$translator = $translationFactory->create($loaders, $locale);
+			$translator->addResource('json', $messagesPath . '/messages.json', $locale);
+			$translator->addResource('json', $messagesPath . '/paymentTypes.json', $locale, 'paymentTypes');
+			$translator->addResource('json', $messagesPath . '/paymentIntervals.json', $locale, 'paymentIntervals');
+			$translator->addResource('json', $messagesPath . '/paymentStatus.json', $locale, 'paymentStatus');
+			$translator->addResource('json', $messagesPath . '/validations.json', $locale, 'validations');
 
 			return $translator;
 		};
 
 		// In the future, this could be locale-specific or filled from a DB table
 		$pimple['honorifics'] = function() {
-			return new Honorifics( [
+			return new Honorifics([
 				'' => 'Kein Titel',
 				'Dr.' => 'Dr.',
 				'Prof.' => 'Prof.',
 				'Prof. Dr.' => 'Prof. Dr.'
-			] );
+			]);
 		};
 
-		$pimple['twig_factory'] = function () {
+		$pimple['twig_factory'] = function() {
 			return new TwigEnvironmentConfigurator(
 				$this->pimple['twig_environment'],
 				$this->config['twig'],
@@ -317,12 +317,12 @@ 
 
 		$pimple['twig'] = function() {
 			$twigFactory = $this->getTwigFactory();
-			$loaders = array_filter( [
+			$loaders = array_filter([
 				$twigFactory->newFileSystemLoader(),
 				$twigFactory->newArrayLoader(), // This is just a fallback for testing
-			] );
+			]);
 			$extensions = [
-				$twigFactory->newTranslationExtension( $this->getTranslator() ),
+				$twigFactory->newTranslationExtension($this->getTranslator()),
 				new Twig_Extensions_Extension_Intl()
 			];
 			$filters = [
@@ -331,7 +331,7 @@ 
 				)
 			];
 
-			return $twigFactory->getEnvironment( $loaders, $extensions, $filters );
+			return $twigFactory->getEnvironment($loaders, $extensions, $filters);
 		};
 
 		$pimple['messenger_suborganization'] = function() {
@@ -351,7 +351,7 @@ 
 		};
 
 		$pimple['confirmation-page-selector'] = function() {
-			return new DonationConfirmationPageSelector( $this->config['confirmation-pages'] );
+			return new DonationConfirmationPageSelector($this->config['confirmation-pages']);
 		};
 
 		$pimple['paypal-payment-notification-verifier'] = function() {
@@ -390,7 +390,7 @@ 
 		$pimple['token_generator'] = function() {
 			return new RandomTokenGenerator(
 				$this->config['token-length'],
-				new \DateInterval( $this->config['token-validity-timestamp'] )
+				new \DateInterval($this->config['token-validity-timestamp'])
 			);
 		};
 
@@ -402,8 +402,8 @@ 
 			return new VoidCache();
 		};
 
-		$pimple['page_view_tracker'] = function () {
-			return new PageViewTracker( $this->newServerSideTracker(), $this->config['piwik']['siteUrlBase'] );
+		$pimple['page_view_tracker'] = function() {
+			return new PageViewTracker($this->newServerSideTracker(), $this->config['piwik']['siteUrlBase']);
 		};
 
 		return $pimple;
@@ -419,17 +419,17 @@ 
 
 	private function newDonationEventLogger(): DonationEventLogger {
 		return new BestEffortDonationEventLogger(
-			new DoctrineDonationEventLogger( $this->getEntityManager() ),
+			new DoctrineDonationEventLogger($this->getEntityManager()),
 			$this->getLogger()
 		);
 	}
 
 	public function newInstaller(): Installer {
-		return ( new StoreFactory( $this->getConnection() ) )->newInstaller();
+		return (new StoreFactory($this->getConnection()))->newInstaller();
 	}
 
 	public function newListCommentsUseCase(): ListCommentsUseCase {
-		return new ListCommentsUseCase( $this->getCommentFinder() );
+		return new ListCommentsUseCase($this->getCommentFinder());
 	}
 
 	public function newCommentListJsonPresenter(): CommentListJsonPresenter {
@@ -437,14 +437,14 @@ 
 	}
 
 	public function newCommentListRssPresenter(): CommentListRssPresenter {
-		return new CommentListRssPresenter( new TwigTemplate(
+		return new CommentListRssPresenter(new TwigTemplate(
 			$this->getTwig(),
 			'Comment_List.rss.twig'
-		) );
+		));
 	}
 
 	public function newCommentListHtmlPresenter(): CommentListHtmlPresenter {
-		return new CommentListHtmlPresenter( $this->getLayoutTemplate( 'Comment_List.html.twig', [ 'piwikGoals' => [ 1 ] ] ) );
+		return new CommentListHtmlPresenter($this->getLayoutTemplate('Comment_List.html.twig', ['piwikGoals' => [1]]));
 	}
 
 	private function getCommentFinder(): CommentFinder {
@@ -455,7 +455,7 @@ 
 		return $this->pimple['subscription_repository'];
 	}
 
-	public function setSubscriptionRepository( SubscriptionRepository $subscriptionRepository ) {
+	public function setSubscriptionRepository(SubscriptionRepository $subscriptionRepository) {
 		$this->pimple['subscription_repository'] = $subscriptionRepository;
 	}
 
@@ -472,25 +472,25 @@ 
 	}
 
 	public function newAddSubscriptionHtmlPresenter(): AddSubscriptionHtmlPresenter {
-		return new AddSubscriptionHtmlPresenter( $this->getIncludeTemplate( 'Subscription_Form.html.twig' ), $this->getTranslator() );
+		return new AddSubscriptionHtmlPresenter($this->getIncludeTemplate('Subscription_Form.html.twig'), $this->getTranslator());
 	}
 
 	public function newConfirmSubscriptionHtmlPresenter(): ConfirmSubscriptionHtmlPresenter {
 		return new ConfirmSubscriptionHtmlPresenter(
-			$this->getLayoutTemplate( 'Confirm_Subscription.twig' ),
+			$this->getLayoutTemplate('Confirm_Subscription.twig'),
 			$this->getTranslator()
 		);
 	}
 
 	public function newAddSubscriptionJsonPresenter(): AddSubscriptionJsonPresenter {
-		return new AddSubscriptionJsonPresenter( $this->getTranslator() );
+		return new AddSubscriptionJsonPresenter($this->getTranslator());
 	}
 
 	public function newGetInTouchHtmlPresenter(): GetInTouchHtmlPresenter {
-		return new GetInTouchHtmlPresenter( $this->getIncludeTemplate( 'Kontaktformular.html.twig' ), $this->getTranslator() );
+		return new GetInTouchHtmlPresenter($this->getIncludeTemplate('Kontaktformular.html.twig'), $this->getTranslator());
 	}
 
-	public function setTwigEnvironment( Twig_Environment $twig ) {
+	public function setTwigEnvironment(Twig_Environment $twig) {
 		$this->pimple['twig_environment'] = $twig;
 	}
 
@@ -505,11 +505,11 @@ 
 	 * @param array $context Additional variables for the template
 	 * @return TwigTemplate
 	 */
-	public function getLayoutTemplate( string $templateName, array $context = [] ): TwigTemplate {
+	public function getLayoutTemplate(string $templateName, array $context = []): TwigTemplate {
 		 return new TwigTemplate(
 			$this->getTwig(),
 			$templateName,
-			array_merge( $this->getDefaultTwigVariables(), $context )
+			array_merge($this->getDefaultTwigVariables(), $context)
 		);
 	}
 
@@ -519,13 +519,13 @@ 
 	 * @param string $templateName Template to include
 	 * @return TwigTemplate
 	 */
-	private function getIncludeTemplate( string $templateName, array $context = [] ): TwigTemplate {
+	private function getIncludeTemplate(string $templateName, array $context = []): TwigTemplate {
 		return new TwigTemplate(
 			$this->getTwig(),
 			'Include_in_Layout.twig',
 			array_merge(
 				$this->getDefaultTwigVariables(),
-				[ 'main_template' => $templateName ],
+				['main_template' => $templateName],
 				$context
 			)
 		);
@@ -560,7 +560,7 @@ 
 			$this->getLogger()
 		);
 
-		return $this->addProfilingDecorator( $pageRetriever, 'PageRetriever' );
+		return $this->addProfilingDecorator($pageRetriever, 'PageRetriever');
 	}
 
 	public function getLogger(): LoggerInterface {
@@ -623,22 +623,22 @@ 
 			new TwigTemplate(
 					$this->getTwig(),
 					'Mail_Subscription_Confirmation.txt.twig',
-					[ 'greeting_generator' => $this->getGreetingGenerator() ]
+					['greeting_generator' => $this->getGreetingGenerator()]
 			),
 			'mail_subject_subscription_confirmed'
 		);
 	}
 
-	private function newTemplateMailer( Messenger $messenger, TwigTemplate $template, string $messageKey ): TemplateBasedMailer {
+	private function newTemplateMailer(Messenger $messenger, TwigTemplate $template, string $messageKey): TemplateBasedMailer {
 		$mailer = new TemplateBasedMailer(
 			$messenger,
 			$template,
-			$this->getTranslator()->trans( $messageKey )
+			$this->getTranslator()->trans($messageKey)
 		);
 
-		$mailer = new LoggingMailer( $mailer, $this->getLogger() );
+		$mailer = new LoggingMailer($mailer, $this->getLogger());
 
-		return $this->addProfilingDecorator( $mailer, 'Mailer' );
+		return $this->addProfilingDecorator($mailer, 'Mailer');
 	}
 
 	public function getGreetingGenerator() {
@@ -646,11 +646,11 @@ 
 	}
 
 	public function newCheckIbanUseCase(): CheckIbanUseCase {
-		return new CheckIbanUseCase( $this->newBankDataConverter(), $this->newIbanValidator() );
+		return new CheckIbanUseCase($this->newBankDataConverter(), $this->newIbanValidator());
 	}
 
 	public function newGenerateIbanUseCase(): GenerateIbanUseCase {
-		return new GenerateIbanUseCase( $this->newBankDataConverter(), $this->newIbanValidator() );
+		return new GenerateIbanUseCase($this->newBankDataConverter(), $this->newIbanValidator());
 	}
 
 	public function newIbanPresenter(): IbanPresenter {
@@ -658,10 +658,10 @@ 
 	}
 
 	public function newBankDataConverter() {
-		return new BankDataConverter( $this->config['bank-data-file'] );
+		return new BankDataConverter($this->config['bank-data-file']);
 	}
 
-	public function setSubscriptionValidator( SubscriptionValidator $subscriptionValidator ) {
+	public function setSubscriptionValidator(SubscriptionValidator $subscriptionValidator) {
 		$this->pimple['subscription_validator'] = $subscriptionValidator;
 	}
 
@@ -676,7 +676,7 @@ 
 	private function newContactUserMailer(): TemplateBasedMailer {
 		return $this->newTemplateMailer(
 			$this->getSuborganizationMessenger(),
-			new TwigTemplate( $this->getTwig(), 'Mail_Contact_Confirm_to_User.txt.twig' ),
+			new TwigTemplate($this->getTwig(), 'Mail_Contact_Confirm_to_User.txt.twig'),
 			'mail_subject_getintouch'
 		);
 	}
@@ -684,8 +684,8 @@ 
 	private function newContactOperatorMailer(): OperatorMailer {
 		return new OperatorMailer(
 			$this->getSuborganizationMessenger(),
-			new TwigTemplate( $this->getTwig(), 'Mail_Contact_Forward_to_Operator.txt.twig' ),
-			$this->getTranslator()->trans( 'mail_subject_getintouch_forward' )
+			new TwigTemplate($this->getTwig(), 'Mail_Contact_Forward_to_Operator.txt.twig'),
+			$this->getTranslator()->trans('mail_subject_getintouch_forward')
 		);
 	}
 
@@ -702,12 +702,12 @@ 
 
 	private function newSubscriptionDuplicateCutoffDate(): \DateTime {
 		$cutoffDateTime = new \DateTime();
-		$cutoffDateTime->sub( new \DateInterval( $this->config['subscription-interval'] ) );
+		$cutoffDateTime->sub(new \DateInterval($this->config['subscription-interval']));
 		return $cutoffDateTime;
 	}
 
 	private function newHonorificValidator(): AllowedValuesValidator {
-		return new AllowedValuesValidator( $this->getHonorifics()->getKeys() );
+		return new AllowedValuesValidator($this->getHonorifics()->getKeys());
 	}
 
 	private function getHonorifics(): Honorifics {
@@ -716,20 +716,20 @@ 
 
 	public function newAuthorizedCachePurger(): AuthorizedCachePurger {
 		return new AuthorizedCachePurger(
-			new AllOfTheCachePurger( $this->getTwig(), $this->getPageCache(), $this->getRenderedPageCache() ),
+			new AllOfTheCachePurger($this->getTwig(), $this->getPageCache(), $this->getRenderedPageCache()),
 			$this->config['purging-secret']
 		);
 	}
 
 	private function newBankDataValidator(): BankDataValidator {
-		return new BankDataValidator( $this->newIbanValidator() );
+		return new BankDataValidator($this->newIbanValidator());
 	}
 
 	private function getSuborganizationMessenger(): Messenger {
 		return $this->pimple['messenger_suborganization'];
 	}
 
-	public function setSuborganizationMessenger( Messenger $messenger ) {
+	public function setSuborganizationMessenger(Messenger $messenger) {
 		$this->pimple['messenger_suborganization'] = $messenger;
 	}
 
@@ -737,42 +737,42 @@ 
 		return $this->pimple['messenger_organization'];
 	}
 
-	public function setOrganizationMessenger( Messenger $messenger ) {
+	public function setOrganizationMessenger(Messenger $messenger) {
 		$this->pimple['messenger_organization'] = $messenger;
 	}
 
 	public function setNullMessenger() {
-		$this->setSuborganizationMessenger( new Messenger(
+		$this->setSuborganizationMessenger(new Messenger(
 			Swift_NullTransport::newInstance(),
 			$this->getSubOrganizationEmailAddress()
-		) );
-		$this->setOrganizationMessenger( new Messenger(
+		));
+		$this->setOrganizationMessenger(new Messenger(
 			Swift_NullTransport::newInstance(),
 			$this->getOrganizationEmailAddress()
-		) );
+		));
 	}
 
 	public function getSubOrganizationEmailAddress(): EmailAddress {
-		return new EmailAddress( $this->config['contact-info']['suborganization']['email'] );
+		return new EmailAddress($this->config['contact-info']['suborganization']['email']);
 	}
 
 	public function getOrganizationEmailAddress() {
-		return new EmailAddress( $this->config['contact-info']['organization']['email'] );
+		return new EmailAddress($this->config['contact-info']['organization']['email']);
 	}
 
 	public function newInternalErrorHtmlPresenter(): InternalErrorHtmlPresenter {
-		return new InternalErrorHtmlPresenter( $this->getIncludeTemplate( 'Error_Page.html.twig' ) );
+		return new InternalErrorHtmlPresenter($this->getIncludeTemplate('Error_Page.html.twig'));
 	}
 
 	public function newAccessDeniedHtmlPresenter(): InternalErrorHtmlPresenter {
-		return new InternalErrorHtmlPresenter( $this->getLayoutTemplate( 'Access_Denied.twig' ) );
+		return new InternalErrorHtmlPresenter($this->getLayoutTemplate('Access_Denied.twig'));
 	}
 
 	public function getTranslator(): TranslatorInterface {
 		return $this->pimple['translator'];
 	}
 
-	public function setTranslator( TranslatorInterface $translator ) {
+	public function setTranslator(TranslatorInterface $translator) {
 		$this->pimple['translator'] = $translator;
 	}
 
@@ -780,24 +780,24 @@ 
 		return $this->pimple['twig_factory'];
 	}
 
-	private function newTextPolicyValidator( string $policyName ): TextPolicyValidator {
+	private function newTextPolicyValidator(string $policyName): TextPolicyValidator {
 		$contentProvider = $this->newLocalFilePageRetriever();
 		$textPolicyConfig = $this->config['text-policies'][$policyName];
 		return new TextPolicyValidator(
-			new PageRetrieverBasedStringList( $contentProvider, $textPolicyConfig['badwords'] ?? '' ),
-			new PageRetrieverBasedStringList( $contentProvider, $textPolicyConfig['whitewords'] ?? '' )
+			new PageRetrieverBasedStringList($contentProvider, $textPolicyConfig['badwords'] ?? ''),
+			new PageRetrieverBasedStringList($contentProvider, $textPolicyConfig['whitewords'] ?? '')
 		);
 	}
 
 	private function newCommentPolicyValidator(): TextPolicyValidator {
-		return $this->newTextPolicyValidator( 'comment' );
+		return $this->newTextPolicyValidator('comment');
 	}
 
-	public function newCancelDonationUseCase( string $updateToken ): CancelDonationUseCase {
+	public function newCancelDonationUseCase(string $updateToken): CancelDonationUseCase {
 		return new CancelDonationUseCase(
 			$this->getDonationRepository(),
 			$this->newCancelDonationMailer(),
-			$this->newDonationAuthorizer( $updateToken ),
+			$this->newDonationAuthorizer($updateToken),
 			$this->newDonationEventLogger()
 		);
 	}
@@ -808,7 +808,7 @@ 
 			new TwigTemplate(
 				$this->getTwig(),
 				'Mail_Donation_Cancellation_Confirmation.txt.twig',
-				[ 'greeting_generator' => $this->getGreetingGenerator() ]
+				['greeting_generator' => $this->getGreetingGenerator()]
 			),
 			'mail_subject_confirm_cancellation'
 		);
@@ -867,27 +867,27 @@ 
 	}
 
 	public function newPayPalUrlGeneratorForDonations() {
-		return new PayPalUrlGenerator( $this->getPayPalUrlConfigForDonations() );
+		return new PayPalUrlGenerator($this->getPayPalUrlConfigForDonations());
 	}
 
 	public function newPayPalUrlGeneratorForMembershipApplications() {
-		return new PayPalUrlGenerator( $this->getPayPalUrlConfigForMembershipApplications() );
+		return new PayPalUrlGenerator($this->getPayPalUrlConfigForMembershipApplications());
 	}
 
 	private function getPayPalUrlConfigForDonations() {
-		return PayPalUrlConfig::newFromConfig( $this->config['paypal-donation'] );
+		return PayPalUrlConfig::newFromConfig($this->config['paypal-donation']);
 	}
 
 	private function getPayPalUrlConfigForMembershipApplications() {
-		return PayPalUrlConfig::newFromConfig( $this->config['paypal-membership'] );
+		return PayPalUrlConfig::newFromConfig($this->config['paypal-membership']);
 	}
 
 	private function newCreditCardUrlGenerator() {
-		return new CreditCardUrlGenerator( $this->newCreditCardUrlConfig() );
+		return new CreditCardUrlGenerator($this->newCreditCardUrlConfig());
 	}
 
 	private function newCreditCardUrlConfig() {
-		return CreditCardUrlConfig::newFromConfig( $this->config['creditcard'] );
+		return CreditCardUrlConfig::newFromConfig($this->config['creditcard']);
 	}
 
 	public function getDonationRepository(): DonationRepository {
@@ -895,27 +895,27 @@ 
 	}
 
 	public function newPaymentDataValidator(): PaymentDataValidator {
-		return new PaymentDataValidator( $this->config['donation-minimum-amount'], $this->config['donation-maximum-amount'] );
+		return new PaymentDataValidator($this->config['donation-minimum-amount'], $this->config['donation-maximum-amount']);
 	}
 
 	private function newAmountFormatter(): AmountFormatter {
-		return new AmountFormatter( $this->config['locale'] );
+		return new AmountFormatter($this->config['locale']);
 	}
 
 	public function newDecimalNumberFormatter(): NumberFormatter {
-		return new NumberFormatter( $this->config['locale'], NumberFormatter::DECIMAL );
+		return new NumberFormatter($this->config['locale'], NumberFormatter::DECIMAL);
 	}
 
-	public function newAddCommentUseCase( string $updateToken ): AddCommentUseCase {
+	public function newAddCommentUseCase(string $updateToken): AddCommentUseCase {
 		return new AddCommentUseCase(
 			$this->getDonationRepository(),
-			$this->newDonationAuthorizer( $updateToken ),
+			$this->newDonationAuthorizer($updateToken),
 			$this->newCommentPolicyValidator(),
 			$this->newAddCommentValidator()
 		);
 	}
 
-	private function newDonationAuthorizer( string $updateToken = null, string $accessToken = null ): DonationAuthorizer {
+	private function newDonationAuthorizer(string $updateToken = null, string $accessToken = null): DonationAuthorizer {
 		return new DoctrineDonationAuthorizer(
 			$this->getEntityManager(),
 			$updateToken,
@@ -929,13 +929,13 @@ 
 
 	public function newDonationConfirmationPresenter() {
 		return new DonationConfirmationHtmlPresenter(
-			$this->getIncludeTemplate( 'Donation_Confirmation.html.twig', [ 'piwikGoals' => [ 3 ] ] )
+			$this->getIncludeTemplate('Donation_Confirmation.html.twig', ['piwikGoals' => [3]])
 		);
 	}
 
 	public function newCreditCardPaymentHtmlPresenter() {
 		return new CreditCardPaymentHtmlPresenter(
-			$this->getIncludeTemplate( 'Credit_Card_Payment_Iframe.html.twig' ),
+			$this->getIncludeTemplate('Credit_Card_Payment_Iframe.html.twig'),
 			$this->getTranslator(),
 			$this->newCreditCardUrlGenerator()
 		);
@@ -943,7 +943,7 @@ 
 
 	public function newCancelDonationHtmlPresenter() {
 		return new CancelDonationHtmlPresenter(
-			$this->getIncludeTemplate( 'Donation_Cancellation_Confirmation.html.twig' )
+			$this->getIncludeTemplate('Donation_Cancellation_Confirmation.html.twig')
 		);
 	}
 
@@ -965,7 +965,7 @@ 
 			new TwigTemplate(
 				$this->getTwig(),
 				'Mail_Membership_Application_Confirmation.txt.twig',
-				[ 'greeting_generator' => $this->getGreetingGenerator() ]
+				['greeting_generator' => $this->getGreetingGenerator()]
 			),
 			'mail_subject_confirm_membership_application'
 		);
@@ -980,23 +980,23 @@ 
 	}
 
 	private function newMembershipApplicationTracker(): ApplicationTracker {
-		return new DoctrineApplicationTracker( $this->getEntityManager() );
+		return new DoctrineApplicationTracker($this->getEntityManager());
 	}
 
 	private function newMembershipApplicationPiwikTracker(): ApplicationPiwikTracker {
-		return new DoctrineApplicationPiwikTracker( $this->getEntityManager() );
+		return new DoctrineApplicationPiwikTracker($this->getEntityManager());
 	}
 
 	private function newApplyForMembershipPolicyValidator(): ApplyForMembershipPolicyValidator {
 		return new ApplyForMembershipPolicyValidator(
-			$this->newTextPolicyValidator( 'fields' ),
+			$this->newTextPolicyValidator('fields'),
 			$this->config['email-address-blacklist']
 		);
 	}
 
-	public function newCancelMembershipApplicationUseCase( string $updateToken ): CancelMembershipApplicationUseCase {
+	public function newCancelMembershipApplicationUseCase(string $updateToken): CancelMembershipApplicationUseCase {
 		return new CancelMembershipApplicationUseCase(
-			$this->newMembershipApplicationAuthorizer( $updateToken ),
+			$this->newMembershipApplicationAuthorizer($updateToken),
 			$this->getMembershipApplicationRepository(),
 			$this->newCancelMembershipApplicationMailer()
 		);
@@ -1022,28 +1022,28 @@ 
 			new TwigTemplate(
 				$this->getTwig(),
 				'Mail_Membership_Application_Cancellation_Confirmation.txt.twig',
-				[ 'greeting_generator' => $this->getGreetingGenerator() ]
+				['greeting_generator' => $this->getGreetingGenerator()]
 			),
 			'mail_subject_confirm_membership_application_cancellation'
 		);
 	}
 
-	public function newMembershipApplicationConfirmationUseCase( string $accessToken ) {
+	public function newMembershipApplicationConfirmationUseCase(string $accessToken) {
 		return new ShowMembershipApplicationConfirmationUseCase(
-			$this->newMembershipApplicationAuthorizer( null, $accessToken ), $this->getMembershipApplicationRepository(),
+			$this->newMembershipApplicationAuthorizer(null, $accessToken), $this->getMembershipApplicationRepository(),
 			$this->newMembershipApplicationTokenFetcher()
 		);
 	}
 
-	public function newShowDonationConfirmationUseCase( string $accessToken ): ShowDonationConfirmationUseCase {
+	public function newShowDonationConfirmationUseCase(string $accessToken): ShowDonationConfirmationUseCase {
 		return new ShowDonationConfirmationUseCase(
-			$this->newDonationAuthorizer( null, $accessToken ),
+			$this->newDonationAuthorizer(null, $accessToken),
 			$this->newDonationTokenFetcher(),
 			$this->getDonationRepository()
 		);
 	}
 
-	public function setDonationConfirmationPageSelector( DonationConfirmationPageSelector $selector ) {
+	public function setDonationConfirmationPageSelector(DonationConfirmationPageSelector $selector) {
 		$this->pimple['confirmation-page-selector'] = $selector;
 	}
 
@@ -1054,39 +1054,39 @@ 
 	public function newDonationFormViolationPresenter() {
 		// TODO make the template name dependent on the 'form' value from the HTTP POST request
 		// (we need different form pages for A/B testing)
-		$template = $this->getLayoutTemplate( 'Display_Page_Layout.twig', [ 'main_template' => 'Donation_Form.html.twig' ] );
-		return new DonationFormViolationPresenter( $template, $this->newAmountFormatter() );
+		$template = $this->getLayoutTemplate('Display_Page_Layout.twig', ['main_template' => 'Donation_Form.html.twig']);
+		return new DonationFormViolationPresenter($template, $this->newAmountFormatter());
 	}
 
 	public function newDonationFormPresenter() {
 		// TODO make the template name dependent on the 'form' value from the HTTP POST request
 		// (we need different form pages for A/B testing)
-		$template = $this->getLayoutTemplate( 'Display_Page_Layout.twig', [ 'main_template' => 'Donation_Form.html.twig' ] );
-		return new DonationFormPresenter( $template, $this->newAmountFormatter() );
+		$template = $this->getLayoutTemplate('Display_Page_Layout.twig', ['main_template' => 'Donation_Form.html.twig']);
+		return new DonationFormPresenter($template, $this->newAmountFormatter());
 	}
 
-	public function newHandlePayPalPaymentNotificationUseCase( string $updateToken ) {
+	public function newHandlePayPalPaymentNotificationUseCase(string $updateToken) {
 		return new HandlePayPalPaymentNotificationUseCase(
 			$this->getDonationRepository(),
-			$this->newDonationAuthorizer( $updateToken ),
+			$this->newDonationAuthorizer($updateToken),
 			$this->newDonationConfirmationMailer(),
 			$this->newDonationEventLogger()
 		);
 	}
 
-	public function newMembershipApplicationSubscriptionSignupNotificationUseCase( string $updateToken ) {
+	public function newMembershipApplicationSubscriptionSignupNotificationUseCase(string $updateToken) {
 		return new HandleSubscriptionSignupNotificationUseCase(
 			$this->getMembershipApplicationRepository(),
-			$this->newMembershipApplicationAuthorizer( $updateToken ),
+			$this->newMembershipApplicationAuthorizer($updateToken),
 			$this->newApplyForMembershipMailer(),
 			$this->getLogger()
 		);
 	}
 
-	public function newMembershipApplicationSubscriptionPaymentNotificationUseCase( string $updateToken ) {
+	public function newMembershipApplicationSubscriptionPaymentNotificationUseCase(string $updateToken) {
 		return new HandleSubscriptionPaymentNotificationUseCase(
 			$this->getMembershipApplicationRepository(),
-			$this->newMembershipApplicationAuthorizer( $updateToken ),
+			$this->newMembershipApplicationAuthorizer($updateToken),
 			$this->newApplyForMembershipMailer(),
 			$this->getLogger()
 		);
@@ -1096,7 +1096,7 @@ 
 		return $this->pimple['paypal-payment-notification-verifier'];
 	}
 
-	public function setPayPalPaymentNotificationVerifier( PaymentNotificationVerifier $verifier ) {
+	public function setPayPalPaymentNotificationVerifier(PaymentNotificationVerifier $verifier) {
 		$this->pimple['paypal-payment-notification-verifier'] = $verifier;
 	}
 
@@ -1104,14 +1104,14 @@ 
 		return $this->pimple['paypal-membership-fee-notification-verifier'];
 	}
 
-	public function setPayPalMembershipFeeNotificationVerifier( PaymentNotificationVerifier $verifier ) {
+	public function setPayPalMembershipFeeNotificationVerifier(PaymentNotificationVerifier $verifier) {
 		$this->pimple['paypal-membership-fee-notification-verifier'] = $verifier;
 	}
 
-	public function newCreditCardNotificationUseCase( string $updateToken ) {
+	public function newCreditCardNotificationUseCase(string $updateToken) {
 		return new CreditCardNotificationUseCase(
 			$this->getDonationRepository(),
-			$this->newDonationAuthorizer( $updateToken ),
+			$this->newDonationAuthorizer($updateToken),
 			$this->getCreditCardService(),
 			$this->newDonationConfirmationMailer(),
 			$this->getLogger(),
@@ -1121,23 +1121,23 @@ 
 
 	public function newCancelMembershipApplicationHtmlPresenter() {
 		return new CancelMembershipApplicationHtmlPresenter(
-			$this->getIncludeTemplate( 'Membership_Application_Cancellation_Confirmation.html.twig' )
+			$this->getIncludeTemplate('Membership_Application_Cancellation_Confirmation.html.twig')
 		);
 	}
 
 	public function newMembershipApplicationConfirmationHtmlPresenter() {
 		return new MembershipApplicationConfirmationHtmlPresenter(
-			$this->getIncludeTemplate( 'Membership_Application_Confirmation.html.twig' )
+			$this->getIncludeTemplate('Membership_Application_Confirmation.html.twig')
 		);
 	}
 
 	public function newMembershipFormViolationPresenter() {
 		return new MembershipFormViolationPresenter(
-			$this->getIncludeTemplate( 'Membership_Application.html.twig' )
+			$this->getIncludeTemplate('Membership_Application.html.twig')
 		);
 	}
 
-	public function setCreditCardService( CreditCardService $ccService ) {
+	public function setCreditCardService(CreditCardService $ccService) {
 		$this->pimple['credit-card-api-service'] = $ccService;
 	}
 
@@ -1150,7 +1150,7 @@ 
 			new TwigTemplate(
 				$this->getTwig(),
 				'Credit_Card_Payment_Notification.txt.twig',
-				[ 'returnUrl' => $this->config['creditcard']['return-url'] ]
+				['returnUrl' => $this->config['creditcard']['return-url']]
 			)
 		);
 	}
@@ -1171,7 +1171,7 @@ 
 		);
 	}
 
-	public function setTokenGenerator( TokenGenerator $tokenGenerator ) {
+	public function setTokenGenerator(TokenGenerator $tokenGenerator) {
 		$this->pimple['token_generator'] = $tokenGenerator;
 	}
 
@@ -1194,23 +1194,23 @@ 
 	private function newDonationPolicyValidator(): AddDonationPolicyValidator {
 		return new AddDonationPolicyValidator(
 			$this->newDonationAmountPolicyValidator(),
-			$this->newTextPolicyValidator( 'fields' ),
+			$this->newTextPolicyValidator('fields'),
 			$this->config['email-address-blacklist']
 		);
 	}
 
 	private function newDonationAmountPolicyValidator(): AmountPolicyValidator {
 		// in the future, this might come from the configuration
-		return new AmountPolicyValidator( 1000, 1000 );
+		return new AmountPolicyValidator(1000, 1000);
 	}
 
 	public function getDonationTimeframeLimit() {
 		return $this->config['donation-timeframe-limit'];
 	}
 
-	public function newSystemMessageResponse( string $message ) {
-		$test = $this->getIncludeTemplate( 'System_Message.html.twig' );
-		return $test->render( [ 'message' => $message ] );
+	public function newSystemMessageResponse(string $message) {
+		$test = $this->getIncludeTemplate('System_Message.html.twig');
+		return $test->render(['message' => $message]);
 	}
 
 	public function getMembershipApplicationTimeframeLimit() {
@@ -1231,37 +1231,37 @@ 
 
 	public function enablePageCache() {
 		$this->pimple['page_cache'] = function() {
-			return new FilesystemCache( $this->getCachePath() . '/pages/raw' );
+			return new FilesystemCache($this->getCachePath() . '/pages/raw');
 		};
 
 		$this->pimple['rendered_page_cache'] = function() {
-			return new FilesystemCache( $this->getCachePath() . '/pages/rendered' );
+			return new FilesystemCache($this->getCachePath() . '/pages/rendered');
 		};
 	}
 
-	private function addProfilingDecorator( $objectToDecorate, string $profilingLabel ) {
-		if ( $this->profiler === null ) {
+	private function addProfilingDecorator($objectToDecorate, string $profilingLabel) {
+		if ($this->profiler === null) {
 			return $objectToDecorate;
 		}
 
-		$builder = new ProfilingDecoratorBuilder( $this->profiler, $this->getProfilerDataCollector() );
+		$builder = new ProfilingDecoratorBuilder($this->profiler, $this->getProfilerDataCollector());
 
-		return $builder->decorate( $objectToDecorate, $profilingLabel );
+		return $builder->decorate($objectToDecorate, $profilingLabel);
 	}
 
-	public function setProfiler( Stopwatch $profiler ) {
+	public function setProfiler(Stopwatch $profiler) {
 		$this->profiler = $profiler;
 	}
 
-	public function setEmailValidator( EmailValidator $validator ) {
+	public function setEmailValidator(EmailValidator $validator) {
 		$this->pimple['mail_validator'] = $validator;
 	}
 
-	public function setLogger( LoggerInterface $logger ) {
+	public function setLogger(LoggerInterface $logger) {
 		$this->pimple['logger'] = $logger;
 	}
 
-	public function setPaypalLogger( LoggerInterface $logger ) {
+	public function setPaypalLogger(LoggerInterface $logger) {
 		$this->pimple['paypal_logger'] = $logger;
 	}
 
@@ -1270,35 +1270,35 @@ 
 	}
 
 	private function newIbanValidator(): IbanValidator {
-		return new IbanValidator( $this->newBankDataConverter(), $this->config['banned-ibans'] );
+		return new IbanValidator($this->newBankDataConverter(), $this->config['banned-ibans']);
 	}
 
 	private function newFilePrefixer(): FilePrefixer {
-		return new FilePrefixer( $this->getFilePrefix() );
+		return new FilePrefixer($this->getFilePrefix());
 	}
 
 	private function getFilePrefix(): string {
 		$prefixContentFile = $this->getVarPath() . '/file_prefix.txt';
-		if ( !file_exists( $prefixContentFile ) ) {
+		if (!file_exists($prefixContentFile)) {
 			return '';
 		}
-		return $prefix = preg_replace( '/[^0-9a-f]/', '', file_get_contents( $prefixContentFile ) );
+		return $prefix = preg_replace('/[^0-9a-f]/', '', file_get_contents($prefixContentFile));
 	}
 
-	public function newDonationAcceptedEventHandler( string $updateToken ): DonationAcceptedEventHandler {
+	public function newDonationAcceptedEventHandler(string $updateToken): DonationAcceptedEventHandler {
 		return new DonationAcceptedEventHandler(
-			$this->newDonationAuthorizer( $updateToken ),
+			$this->newDonationAuthorizer($updateToken),
 			$this->getDonationRepository(),
 			$this->newDonationConfirmationMailer()
 		);
 	}
 
 	public function newPageNotFoundHtmlPresenter(): PageNotFoundPresenter {
-		return new PageNotFoundPresenter( $this->getLayoutTemplate( 'Page_not_found.html.twig' ) );
+		return new PageNotFoundPresenter($this->getLayoutTemplate('Page_not_found.html.twig'));
 	}
 
-	public function setPageViewTracker( PageViewTracker $tracker ) {
-		$this->pimple['page_view_tracker'] = function () use ( $tracker )  {
+	public function setPageViewTracker(PageViewTracker $tracker) {
+		$this->pimple['page_view_tracker'] = function() use ($tracker)  {
 			return $tracker;
 		};
 	}
@@ -1311,7 +1311,7 @@ 
 		// the "https:" prefix does NOT get any slashes because baseURL is stored in a protocol-agnostic way
 		// (e.g. "//tracking.wikimedia.de" )
 		return new PiwikServerSideTracker(
-			new \PiwikTracker( $this->config['piwik']['siteId'], 'https:' . $this->config['piwik']['baseUrl'] )
+			new \PiwikTracker($this->config['piwik']['siteId'], 'https:' . $this->config['piwik']['baseUrl'])
 		);
 	}