wmde / FundraisingFrontend

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
 	);
 } );

app/routes.php

Spacing +194 added lines, -194 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;
@@ -43,129 +43,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;
@@ -174,10 +174,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)
 			)
 		);
 
@@ -194,16 +194,16 @@ 
 
 $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')
 			)
 		);
 	}
@@ -211,126 +211,126 @@ 
 
 $app->get(
 	'page/{pageName}',
-	function( $pageName ) use ( $ffFactory ) {
-		if ( !$ffFactory->getTemplateNameValidator()->validate( $pageName )->isSuccessful() ) {
-			throw new NotFoundHttpException( "Page '$pageName' not found." );
+	function($pageName) use ($ffFactory) {
+		if (!$ffFactory->getTemplateNameValidator()->validate($pageName)->isSuccessful()) {
+			throw new NotFoundHttpException("Page '$pageName' not found.");
 		}
 
-		return $ffFactory->getLayoutTemplate( 'DisplayPageLayout.twig' )->render( [
+		return $ffFactory->getLayoutTemplate('DisplayPageLayout.twig')->render([
 			'main_template' => $pageName
-		] );
+		]);
 	}
 )
-->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' => 'KontaktBestaetigung' ] ) );
+		$contactFormResponse = $ffFactory->newGetInTouchUseCase()->processContactRequest($contactFormRequest);
+		if ($contactFormResponse->isSuccessful()) {
+			return $app->redirect($app['url_generator']->generate('page', ['pageName' => 'KontaktBestaetigung']));
 		}
-		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;
@@ -340,144 +340,144 @@ 
 
 $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->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;
 			} )
 	);
 
@@ -498,37 +498,37 @@ 
 // 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/MembershipApplication' );
+			return (new RouteRedirectionHandler($app, $request->getQueryString()))->handle('/page/MembershipApplication');
 		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(
 		[
@@ -539,7 +539,7 @@ 
 	);
 } );
 
-$app->get( 'status', function() {
+$app->get('status', function() {
 	return 'Status: OK (Online)';
 } );