wmde / FundraisingFrontend

src/Presentation/Presenters/DonationConfirmationHtmlPresenter.php

Spacing +28 added lines, -28 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types = 1);
 
 namespace WMDE\Fundraising\Frontend\Presentation\Presenters;
 
@@ -25,41 +25,41 @@ 
 	private $template;
 	private $urlGenerator;
 
-	public function __construct( TwigTemplate $template, UrlGenerator $urlGenerator ) {
+	public function __construct(TwigTemplate $template, UrlGenerator $urlGenerator) {
 		$this->template = $template;
 		$this->urlGenerator = $urlGenerator;
 	}
 
-	public function present( Donation $donation, string $updateToken, string $accessToken,
-							 SelectedConfirmationPage $selectedPage, PiwikEvents $piwikEvents ): string {
+	public function present(Donation $donation, string $updateToken, string $accessToken,
+							 SelectedConfirmationPage $selectedPage, PiwikEvents $piwikEvents): string {
 		return $this->template->render(
-			$this->getConfirmationPageArguments( $donation, $updateToken, $accessToken, $selectedPage, $piwikEvents )
+			$this->getConfirmationPageArguments($donation, $updateToken, $accessToken, $selectedPage, $piwikEvents)
 		);
 	}
 
-	private function getConfirmationPageArguments( Donation $donation, string $updateToken, string $accessToken,
-												   SelectedConfirmationPage $selectedPage, PiwikEvents $piwikEvents ): array {
+	private function getConfirmationPageArguments(Donation $donation, string $updateToken, string $accessToken,
+												   SelectedConfirmationPage $selectedPage, PiwikEvents $piwikEvents): array {
 
 		return [
 			'template_name' => $selectedPage->getPageTitle(),
 			'templateCampaign' => $selectedPage->getCampaignCode(),
 			'donation' => [
 				'id' => $donation->getId(),
-				'status' => $this->mapStatus( $donation->getStatus() ),
+				'status' => $this->mapStatus($donation->getStatus()),
 				'amount' => $donation->getAmount()->getEuroFloat(),
 				'interval' => $donation->getPaymentIntervalInMonths(),
 				'paymentType' => $donation->getPaymentType(),
 				'optsIntoNewsletter' => $donation->getOptsIntoNewsletter(),
-				'bankTransferCode' => $this->getBankTransferCode( $donation->getPaymentMethod() ),
+				'bankTransferCode' => $this->getBankTransferCode($donation->getPaymentMethod()),
 				// TODO: use locale to determine the date format
-				'creationDate' => ( new \DateTime() )->format( 'd.m.Y' ),
+				'creationDate' => (new \DateTime())->format('d.m.Y'),
 				// TODO: set cookie duration for "hide banner cookie"
 				'cookieDuration' => '15552000', // 180 days
 				'updateToken' => $updateToken
 			],
-			'person' => $this->getPersonArguments( $donation ),
-			'bankData' => $this->getBankDataArguments( $donation->getPaymentMethod() ),
-			'initialFormValues' => $this->getInitialMembershipFormValues( $donation ),
+			'person' => $this->getPersonArguments($donation),
+			'bankData' => $this->getBankDataArguments($donation->getPaymentMethod()),
+			'initialFormValues' => $this->getInitialMembershipFormValues($donation),
 			'piwikEvents' => $piwikEvents->getEvents(),
 			'commentUrl' => $this->urlGenerator->generateUrl(
 				'AddCommentPage',
@@ -72,8 +72,8 @@ 
 		];
 	}
 
-	private function getPersonArguments( Donation $donation ): array {
-		if ( $donation->getDonor() !== null ) {
+	private function getPersonArguments(Donation $donation): array {
+		if ($donation->getDonor() !== null) {
 			return [
 				'salutation' => $donation->getDonor()->getName()->getSalutation(),
 				'fullName' => $donation->getDonor()->getName()->getFullName(),
@@ -89,16 +89,16 @@ 
 		return [];
 	}
 
-	private function getBankTransferCode( PaymentMethod $paymentMethod ): string {
-		if ( $paymentMethod instanceof BankTransferPayment ) {
+	private function getBankTransferCode(PaymentMethod $paymentMethod): string {
+		if ($paymentMethod instanceof BankTransferPayment) {
 			return $paymentMethod->getBankTransferCode();
 		}
 
 		return '';
 	}
 
-	private function getBankDataArguments( PaymentMethod $paymentMethod ): array {
-		if ( $paymentMethod instanceof DirectDebitPayment ) {
+	private function getBankDataArguments(PaymentMethod $paymentMethod): array {
+		if ($paymentMethod instanceof DirectDebitPayment) {
 			return [
 				'iban' => $paymentMethod->getBankData()->getIban()->toString(),
 				'bic' => $paymentMethod->getBankData()->getBic(),
@@ -109,15 +109,15 @@ 
 		return [];
 	}
 
-	private function getInitialMembershipFormValues( Donation $donation ): array {
+	private function getInitialMembershipFormValues(Donation $donation): array {
 		return array_merge(
-			$this->getMembershipFormPersonValues( $donation->getDonor() ),
-			$this->getMembershipFormBankDataValues( $donation->getPaymentMethod() )
+			$this->getMembershipFormPersonValues($donation->getDonor()),
+			$this->getMembershipFormBankDataValues($donation->getPaymentMethod())
 		);
 	}
 
-	private function getMembershipFormPersonValues( Donor $donor = null ): array {
-		if ( $donor === null ) {
+	private function getMembershipFormPersonValues(Donor $donor = null): array {
+		if ($donor === null) {
 			return [];
 		}
 
@@ -136,8 +136,8 @@ 
 		];
 	}
 
-	private function getMembershipFormBankDataValues( PaymentMethod $paymentMethod ): array {
-		if ( !$paymentMethod instanceof DirectDebitPayment ) {
+	private function getMembershipFormBankDataValues(PaymentMethod $paymentMethod): array {
+		if (!$paymentMethod instanceof DirectDebitPayment) {
 			return [];
 		}
 
@@ -156,8 +156,8 @@ 
 	 * @param string $status
 	 * @return string
 	 */
-	private function mapStatus( string $status ): string {
-		switch ( $status ) {
+	private function mapStatus(string $status): string {
+		switch ($status) {
 			case Donation::STATUS_MODERATION:
 				return 'status-pending';
 			case Donation::STATUS_NEW:

src/Factories/FunFunFactory.php

Spacing +206 added lines, -206 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types = 1);
 
 namespace WMDE\Fundraising\Frontend\Factories;
 
@@ -190,7 +190,7 @@ 
 	 */
 	private $profiler = null;
 
-	public function __construct( array $config ) {
+	public function __construct(array $config) {
 		$this->config = $config;
 		$this->pimple = $this->newPimple();
 	}
@@ -215,15 +215,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;
@@ -231,53 +231,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->getSkinTwig() );
+			return new TemplateNameValidator($this->getSkinTwig());
 		};
 
 		$pimple['contact_validator'] = function() {
-			return new GetInTouchValidator( $this->getEmailValidator() );
+			return new GetInTouchValidator($this->getEmailValidator());
 		};
 
 		$pimple['greeting_generator'] = function() {
@@ -291,9 +291,9 @@ 
 			];
 			$locale = $this->config['locale'];
 			$messagesPath = $this->getI18nDirectory() . $this->config['translation']['message-dir'];
-			$translator = $translationFactory->create( $loaders, $locale );
+			$translator = $translationFactory->create($loaders, $locale);
 			foreach ($this->config['translation']['files'] as $domain => $file) {
-				$translator->addResource( 'json', $messagesPath . '/' . $file, $locale, $domain );
+				$translator->addResource('json', $messagesPath . '/' . $file, $locale, $domain);
 			}
 
 			return $translator;
@@ -301,27 +301,27 @@ 
 
 		// 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'] = function() {
 			$config = $this->config['twig'];
 			$config['loaders']['filesystem']['template-dir'] = 'skins/' . $this->getSkinSettings()->getSkin() . '/templates';
 
-			$twigFactory = $this->newTwigFactory( $config );
+			$twigFactory = $this->newTwigFactory($config);
 			$configurator = $twigFactory->newTwigEnvironmentConfigurator();
 
-			$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 = [
@@ -332,48 +332,48 @@ 
 			$functions = [
 				new Twig_SimpleFunction(
 					'web_content',
-					function( string $name, array $context = [] ): string {
-						return $this->getContentProvider()->getWeb( $name, $context );
+					function(string $name, array $context = []): string {
+						return $this->getContentProvider()->getWeb($name, $context);
 					},
-					[ 'is_safe' => [ 'html' ] ]
+					['is_safe' => ['html']]
 				),
 			];
 
-			return $configurator->getEnvironment( $this->pimple['skin_twig_environment'], $loaders, $extensions, $filters, $functions );
+			return $configurator->getEnvironment($this->pimple['skin_twig_environment'], $loaders, $extensions, $filters, $functions);
 		};
 
 		$pimple['mailer_twig'] = function() {
-			$twigFactory = $this->newTwigFactory( $this->config['mailer-twig'] );
+			$twigFactory = $this->newTwigFactory($this->config['mailer-twig']);
 			$configurator = $twigFactory->newTwigEnvironmentConfigurator();
 
-			$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 = [];
 			$functions = [
 				new Twig_SimpleFunction(
 					'mail_content',
-					function( string $name, array $context = [] ): string {
-						return $this->getContentProvider()->getMail( $name, $context );
+					function(string $name, array $context = []): string {
+						return $this->getContentProvider()->getMail($name, $context);
 					},
-					[ 'is_safe' => [ 'all' ] ]
+					['is_safe' => ['all']]
 				),
 				new Twig_SimpleFunction(
 					'url',
-					function( string $name, array $parameters = [] ): string {
-						return $this->getUrlGenerator()->generateUrl( $name, $parameters );
+					function(string $name, array $parameters = []): string {
+						return $this->getUrlGenerator()->generateUrl($name, $parameters);
 					}
 				)
 			];
 
 			$twigEnvironment = new Twig_Environment();
 
-			return $configurator->getEnvironment( $twigEnvironment, $loaders, $extensions, $filters, $functions );
+			return $configurator->getEnvironment($twigEnvironment, $loaders, $extensions, $filters, $functions);
 		};
 
 		$pimple['messenger_suborganization'] = function() {
@@ -393,7 +393,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() {
@@ -432,14 +432,14 @@ 
 		$pimple['donation_token_generator'] = function() {
 			return new RandomTokenGenerator(
 				$this->config['token-length'],
-				new \DateInterval( $this->config['token-validity-timestamp'] )
+				new \DateInterval($this->config['token-validity-timestamp'])
 			);
 		};
 
 		$pimple['membership_token_generator'] = function() {
 			return new RandomMembershipTokenGenerator(
 				$this->config['token-length'],
-				new \DateInterval( $this->config['token-validity-timestamp'] )
+				new \DateInterval($this->config['token-validity-timestamp'])
 			);
 		};
 
@@ -451,41 +451,41 @@ 
 			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']);
 		};
 
-		$pimple['cachebusting_fileprefixer'] = function () {
-			return new FilePrefixer( $this->getFilePrefix() );
+		$pimple['cachebusting_fileprefixer'] = function() {
+			return new FilePrefixer($this->getFilePrefix());
 		};
 
-		$pimple['content_page_selector'] = function () {
-			$json = (new SimpleFileFetcher())->fetchFile( $this->getI18nDirectory() . '/data/pages.json' );
-			$config = json_decode( $json, true ) ?? [];
+		$pimple['content_page_selector'] = function() {
+			$json = (new SimpleFileFetcher())->fetchFile($this->getI18nDirectory() . '/data/pages.json');
+			$config = json_decode($json, true) ?? [];
 
-			return new PageSelector( $config );
+			return new PageSelector($config);
 		};
 
-		$pimple['content_provider'] = function () {
-			return new ContentProvider( [
+		$pimple['content_provider'] = function() {
+			return new ContentProvider([
 				'content_path' => $this->getI18nDirectory(),
 				'cache' => $this->config['twig']['enable-cache'] ? $this->getCachePath() . '/content' : false,
 				'globals' => [
 					'basepath' => $this->config['web-basepath']
 				]
-			] );
+			]);
 		};
 
 		$pimple['payment-delay-calculator'] = function() {
-			return new DefaultPaymentDelayCalculator( $this->getPaymentDelayInDays() );
+			return new DefaultPaymentDelayCalculator($this->getPaymentDelayInDays());
 		};
 
-		$pimple['sofort-client'] = function () {
+		$pimple['sofort-client'] = function() {
 			$config = $this->config['sofort'];
-			return new SofortClient( $config['config-key'] );
+			return new SofortClient($config['config-key']);
 		};
 
-		$pimple['cookie-builder'] = function (): CookieBuilder {
+		$pimple['cookie-builder'] = function(): CookieBuilder {
 			return new CookieBuilder(
 				$this->config['cookie']['expiration'],
 				$this->config['cookie']['path'],
@@ -497,13 +497,13 @@ 
 			);
 		};
 
-		$pimple['skin-settings'] = function (): SkinSettings {
+		$pimple['skin-settings'] = function(): SkinSettings {
 			$config = $this->config['skin'];
-			return new SkinSettings( $config['options'], $config['default'], $config['cookie-lifetime'] );
+			return new SkinSettings($config['options'], $config['default'], $config['cookie-lifetime']);
 		};
 
-		$pimple['payment-types-settings'] = function (): PaymentTypesSettings {
-			return new PaymentTypesSettings( $this->config['payment-types'] );
+		$pimple['payment-types-settings'] = function(): PaymentTypesSettings {
+			return new PaymentTypesSettings($this->config['payment-types']);
 		};
 
 		return $pimple;
@@ -519,17 +519,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 {
@@ -537,14 +537,14 @@ 
 	}
 
 	public function newCommentListRssPresenter(): CommentListRssPresenter {
-		return new CommentListRssPresenter( new TwigTemplate(
+		return new CommentListRssPresenter(new TwigTemplate(
 			$this->getSkinTwig(),
 			'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 {
@@ -555,7 +555,7 @@ 
 		return $this->pimple['subscription_repository'];
 	}
 
-	public function setSubscriptionRepository( SubscriptionRepository $subscriptionRepository ): void {
+	public function setSubscriptionRepository(SubscriptionRepository $subscriptionRepository): void {
 		$this->pimple['subscription_repository'] = $subscriptionRepository;
 	}
 
@@ -572,25 +572,25 @@ 
 	}
 
 	public function newAddSubscriptionHtmlPresenter(): AddSubscriptionHtmlPresenter {
-		return new AddSubscriptionHtmlPresenter( $this->getLayoutTemplate( 'Subscription_Form.html.twig' ), $this->getTranslator() );
+		return new AddSubscriptionHtmlPresenter($this->getLayoutTemplate('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->getLayoutTemplate( 'contact_form.html.twig' ), $this->getTranslator() );
+		return new GetInTouchHtmlPresenter($this->getLayoutTemplate('contact_form.html.twig'), $this->getTranslator());
 	}
 
-	public function setSkinTwigEnvironment( Twig_Environment $twig ): void {
+	public function setSkinTwigEnvironment(Twig_Environment $twig): void {
 		$this->pimple['skin_twig_environment'] = $twig;
 	}
 
@@ -609,19 +609,19 @@ 
 	 * @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->getSkinTwig(),
 			$templateName,
-			array_merge( $this->getDefaultTwigVariables(), $context )
+			array_merge($this->getDefaultTwigVariables(), $context)
 		);
 	}
 
-	public function getMailerTemplate( string $templateName, array $context = [] ): TwigTemplate {
+	public function getMailerTemplate(string $templateName, array $context = []): TwigTemplate {
 		return new TwigTemplate(
 			$this->getMailerTwig(),
 			$templateName,
-			array_merge( $this->getDefaultTwigVariables(), $context )
+			array_merge($this->getDefaultTwigVariables(), $context)
 		);
 	}
 
@@ -633,13 +633,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->getSkinTwig(),
 			'Include_in_Layout.twig',
 			array_merge(
 				$this->getDefaultTwigVariables(),
-				[ 'main_template' => $templateName ],
+				['main_template' => $templateName],
 				$context
 			)
 		);
@@ -722,7 +722,7 @@ 
 			new TwigTemplate(
 					$this->getMailerTwig(),
 					'Subscription_Confirmation.txt.twig',
-					[ 'greeting_generator' => $this->getGreetingGenerator() ]
+					['greeting_generator' => $this->getGreetingGenerator()]
 			),
 			'mail_subject_subscription_confirmed'
 		);
@@ -734,16 +734,16 @@ 
 	 * So much decoration going on that explicitly hinting what we return (Robustness principle) would be confusing
 	 * (you'd expect a TemplateBasedMailer, not a LoggingMailer), so we hint the interface instead.
 	 */
-	private function newTemplateMailer( Messenger $messenger, TwigTemplate $template, string $messageKey ): TemplateMailerInterface {
+	private function newTemplateMailer(Messenger $messenger, TwigTemplate $template, string $messageKey): TemplateMailerInterface {
 		$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(): GreetingGenerator {
@@ -751,11 +751,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 {
@@ -763,10 +763,10 @@ 
 	}
 
 	public function newBankDataConverter(): BankDataConverter {
-		return new BankDataConverter( $this->config['bank-data-file'] );
+		return new BankDataConverter($this->config['bank-data-file']);
 	}
 
-	public function setSubscriptionValidator( SubscriptionValidator $subscriptionValidator ): void {
+	public function setSubscriptionValidator(SubscriptionValidator $subscriptionValidator): void {
 		$this->pimple['subscription_validator'] = $subscriptionValidator;
 	}
 
@@ -781,7 +781,7 @@ 
 	private function newContactUserMailer(): TemplateMailerInterface {
 		return $this->newTemplateMailer(
 			$this->getSuborganizationMessenger(),
-			new TwigTemplate( $this->getMailerTwig(), 'Contact_Confirm_to_User.txt.twig' ),
+			new TwigTemplate($this->getMailerTwig(), 'Contact_Confirm_to_User.txt.twig'),
 			'mail_subject_getintouch'
 		);
 	}
@@ -789,8 +789,8 @@ 
 	private function newContactOperatorMailer(): OperatorMailer {
 		return new OperatorMailer(
 			$this->getSuborganizationMessenger(),
-			new TwigTemplate( $this->getMailerTwig(), 'Contact_Forward_to_Operator.txt.twig' ),
-			$this->getTranslator()->trans( 'mail_subject_getintouch_forward' )
+			new TwigTemplate($this->getMailerTwig(), 'Contact_Forward_to_Operator.txt.twig'),
+			$this->getTranslator()->trans('mail_subject_getintouch_forward')
 		);
 	}
 
@@ -807,12 +807,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 {
@@ -821,20 +821,20 @@ 
 
 	public function newAuthorizedCachePurger(): AuthorizedCachePurger {
 		return new AuthorizedCachePurger(
-			new AllOfTheCachePurger( $this->getSkinTwig(), $this->getPageCache(), $this->getRenderedPageCache() ),
+			new AllOfTheCachePurger($this->getSkinTwig(), $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 ): void {
+	public function setSuborganizationMessenger(Messenger $messenger): void {
 		$this->pimple['messenger_suborganization'] = $messenger;
 	}
 
@@ -842,57 +842,57 @@ 
 		return $this->pimple['messenger_organization'];
 	}
 
-	public function setOrganizationMessenger( Messenger $messenger ): void {
+	public function setOrganizationMessenger(Messenger $messenger): void {
 		$this->pimple['messenger_organization'] = $messenger;
 	}
 
 	public function setNullMessenger(): void {
-		$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(): EmailAddress {
-		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->getLayoutTemplate( 'Error_Page.html.twig' ) );
+		return new InternalErrorHtmlPresenter($this->getLayoutTemplate('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 ): void {
+	public function setTranslator(TranslatorInterface $translator): void {
 		$this->pimple['translator'] = $translator;
 	}
 
-	private function newTwigFactory( array $twigConfig ): TwigFactory {
+	private function newTwigFactory(array $twigConfig): TwigFactory {
 		return new TwigFactory(
 			array_merge_recursive(
 				$twigConfig,
-				[ 'web-basepath' => $this->config['web-basepath'] ]
+				['web-basepath' => $this->config['web-basepath']]
 			),
 			$this->getCachePath() . '/twig',
 			$this->config['locale']
 		);
 	}
 
-	private function newTextPolicyValidator( string $policyName ): TextPolicyValidator {
+	private function newTextPolicyValidator(string $policyName): TextPolicyValidator {
 		$fetcher = new ErrorLoggingFileFetcher(
 			new SimpleFileFetcher(),
 			$this->getLogger()
@@ -901,24 +901,24 @@ 
 		return new TextPolicyValidator(
 			new WordListFileReader(
 				$fetcher,
-				$textPolicyConfig['badwords'] ? $this->getAbsolutePath( $textPolicyConfig['badwords'] ) : ''
+				$textPolicyConfig['badwords'] ? $this->getAbsolutePath($textPolicyConfig['badwords']) : ''
 			),
 			new WordListFileReader(
 				$fetcher,
-				$textPolicyConfig['whitewords'] ? $this->getAbsolutePath( $textPolicyConfig['whitewords'] ) : ''
+				$textPolicyConfig['whitewords'] ? $this->getAbsolutePath($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()
 		);
 	}
@@ -929,7 +929,7 @@ 
 			new TwigTemplate(
 				$this->getMailerTwig(),
 				'Donation_Cancellation_Confirmation.txt.twig',
-				[ 'greeting_generator' => $this->getGreetingGenerator() ]
+				['greeting_generator' => $this->getGreetingGenerator()]
 			),
 			'mail_subject_confirm_cancellation'
 		);
@@ -988,23 +988,23 @@ 
 	public function newPayPalUrlGeneratorForDonations(): PayPalUrlGenerator {
 		return new PayPalUrlGenerator(
 			$this->getPayPalUrlConfigForDonations(),
-			$this->getTranslator()->trans( 'item_name_donation' )
+			$this->getTranslator()->trans('item_name_donation')
 		);
 	}
 
 	public function newPayPalUrlGeneratorForMembershipApplications(): PayPalUrlGenerator {
 		return new PayPalUrlGenerator(
 			$this->getPayPalUrlConfigForMembershipApplications(),
-			$this->getTranslator()->trans( 'item_name_membership' )
+			$this->getTranslator()->trans('item_name_membership')
 		);
 	}
 
 	private function getPayPalUrlConfigForDonations(): PayPalConfig {
-		return PayPalConfig::newFromConfig( $this->config['paypal-donation'] );
+		return PayPalConfig::newFromConfig($this->config['paypal-donation']);
 	}
 
 	private function getPayPalUrlConfigForMembershipApplications(): PayPalConfig {
-		return PayPalConfig::newFromConfig( $this->config['paypal-membership'] );
+		return PayPalConfig::newFromConfig($this->config['paypal-membership']);
 	}
 
 	public function newSofortUrlGeneratorForDonations(): SofortUrlGenerator {
@@ -1012,7 +1012,7 @@ 
 
 		return new SofortUrlGenerator(
 			new SofortConfig(
-				$this->getTranslator()->trans( 'item_name_donation', [], 'messages' ),
+				$this->getTranslator()->trans('item_name_donation', [], 'messages'),
 				$config['return-url'],
 				$config['cancel-url'],
 				$config['notification-url']
@@ -1021,7 +1021,7 @@ 
 		);
 	}
 
-	public function setSofortClient( SofortClient $client ): void {
+	public function setSofortClient(SofortClient $client): void {
 		$this->pimple['sofort-client'] = $client;
 	}
 
@@ -1030,11 +1030,11 @@ 
 	}
 
 	private function newCreditCardUrlGenerator(): CreditCardUrlGenerator {
-		return new CreditCardUrlGenerator( $this->newCreditCardUrlConfig() );
+		return new CreditCardUrlGenerator($this->newCreditCardUrlConfig());
 	}
 
 	private function newCreditCardUrlConfig(): CreditCardConfig {
-		return CreditCardConfig::newFromConfig( $this->config['creditcard'] );
+		return CreditCardConfig::newFromConfig($this->config['creditcard']);
 	}
 
 	public function getDonationRepository(): DonationRepository {
@@ -1050,23 +1050,23 @@ 
 	}
 
 	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,
@@ -1082,12 +1082,12 @@ 
 		return $this->pimple['membership_token_generator'];
 	}
 
-	public function newDonationConfirmationPresenter( string $templateName = 'Donation_Confirmation.html.twig' ): DonationConfirmationHtmlPresenter {
+	public function newDonationConfirmationPresenter(string $templateName = 'Donation_Confirmation.html.twig'): DonationConfirmationHtmlPresenter {
 		return new DonationConfirmationHtmlPresenter(
 			$this->getLayoutTemplate(
 				$templateName,
 				[
-					'piwikGoals' => [ 3 ],
+					'piwikGoals' => [3],
 					'paymentTypes' => $this->getPaymentTypesSettings()->getEnabledForMembershipApplication()
 				]
 			),
@@ -1104,7 +1104,7 @@ 
 
 	public function newCancelDonationHtmlPresenter(): CancelDonationHtmlPresenter {
 		return new CancelDonationHtmlPresenter(
-			$this->getLayoutTemplate( 'Donation_Cancellation_Confirmation.html.twig' )
+			$this->getLayoutTemplate('Donation_Cancellation_Confirmation.html.twig')
 		);
 	}
 
@@ -1127,7 +1127,7 @@ 
 			new TwigTemplate(
 				$this->getMailerTwig(),
 				'Membership_Application_Confirmation.txt.twig',
-				[ 'greeting_generator' => $this->getGreetingGenerator() ]
+				['greeting_generator' => $this->getGreetingGenerator()]
 			),
 			'mail_subject_confirm_membership_application'
 		);
@@ -1142,11 +1142,11 @@ 
 	}
 
 	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 getPaymentDelayCalculator(): PaymentDelayCalculator {
@@ -1157,20 +1157,20 @@ 
 		return $this->getPayPalUrlConfigForMembershipApplications()->getDelayInDays();
 	}
 
-	public function setPaymentDelayCalculator( PaymentDelayCalculator $paymentDelayCalculator ): void {
+	public function setPaymentDelayCalculator(PaymentDelayCalculator $paymentDelayCalculator): void {
 		$this->pimple['payment-delay-calculator'] = $paymentDelayCalculator;
 	}
 
 	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()
 		);
@@ -1196,28 +1196,28 @@ 
 			new TwigTemplate(
 				$this->getMailerTwig(),
 				'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 ): ShowMembershipApplicationConfirmationUseCase {
+	public function newMembershipApplicationConfirmationUseCase(string $accessToken): ShowMembershipApplicationConfirmationUseCase {
 		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 ): void {
+	public function setDonationConfirmationPageSelector(DonationConfirmationPageSelector $selector): void {
 		$this->pimple['confirmation-page-selector'] = $selector;
 	}
 
@@ -1226,57 +1226,57 @@ 
 	}
 
 	public function newDonationFormViolationPresenter(): DonationFormViolationPresenter {
-		return new DonationFormViolationPresenter( $this->getDonationFormTemplate(), $this->newAmountFormatter() );
+		return new DonationFormViolationPresenter($this->getDonationFormTemplate(), $this->newAmountFormatter());
 	}
 
 	public function newDonationFormPresenter(): DonationFormPresenter {
-		return new DonationFormPresenter( $this->getDonationFormTemplate(), $this->newAmountFormatter() );
+		return new DonationFormPresenter($this->getDonationFormTemplate(), $this->newAmountFormatter());
 	}
 
 	private function getDonationFormTemplate(): TwigTemplate {
 		// TODO make the template name dependent on the 'form' value from the HTTP POST request
 		// (we need different form pages for A/B testing)
-		return $this->getLayoutTemplate( 'Donation_Form.html.twig', [
+		return $this->getLayoutTemplate('Donation_Form.html.twig', [
 			'paymentTypes' => $this->getPaymentTypesSettings()->getEnabledForDonation()
-		] );
+		]);
 	}
 
 	public function getMembershipApplicationFormTemplate(): TwigTemplate {
-		return $this->getLayoutTemplate( 'Membership_Application.html.twig', [
+		return $this->getLayoutTemplate('Membership_Application.html.twig', [
 			'paymentTypes' => $this->getPaymentTypesSettings()->getEnabledForMembershipApplication()
-		] );
+		]);
 	}
 
-	public function newHandleSofortPaymentNotificationUseCase( string $updateToken ): SofortPaymentNotificationUseCase {
+	public function newHandleSofortPaymentNotificationUseCase(string $updateToken): SofortPaymentNotificationUseCase {
 		return new SofortPaymentNotificationUseCase(
 			$this->getDonationRepository(),
-			$this->newDonationAuthorizer( $updateToken ),
+			$this->newDonationAuthorizer($updateToken),
 			$this->newDonationConfirmationMailer()
 		);
 	}
 
-	public function newHandlePayPalPaymentNotificationUseCase( string $updateToken ): HandlePayPalPaymentNotificationUseCase {
+	public function newHandlePayPalPaymentNotificationUseCase(string $updateToken): HandlePayPalPaymentNotificationUseCase {
 		return new HandlePayPalPaymentNotificationUseCase(
 			$this->getDonationRepository(),
-			$this->newDonationAuthorizer( $updateToken ),
+			$this->newDonationAuthorizer($updateToken),
 			$this->newDonationConfirmationMailer(),
 			$this->newDonationEventLogger()
 		);
 	}
 
-	public function newMembershipApplicationSubscriptionSignupNotificationUseCase( string $updateToken ): HandleSubscriptionSignupNotificationUseCase {
+	public function newMembershipApplicationSubscriptionSignupNotificationUseCase(string $updateToken): HandleSubscriptionSignupNotificationUseCase {
 		return new HandleSubscriptionSignupNotificationUseCase(
 			$this->getMembershipApplicationRepository(),
-			$this->newMembershipApplicationAuthorizer( $updateToken ),
+			$this->newMembershipApplicationAuthorizer($updateToken),
 			$this->newApplyForMembershipMailer(),
 			$this->getLogger()
 		);
 	}
 
-	public function newMembershipApplicationSubscriptionPaymentNotificationUseCase( string $updateToken ): HandleSubscriptionPaymentNotificationUseCase {
+	public function newMembershipApplicationSubscriptionPaymentNotificationUseCase(string $updateToken): HandleSubscriptionPaymentNotificationUseCase {
 		return new HandleSubscriptionPaymentNotificationUseCase(
 			$this->getMembershipApplicationRepository(),
-			$this->newMembershipApplicationAuthorizer( $updateToken ),
+			$this->newMembershipApplicationAuthorizer($updateToken),
 			$this->newApplyForMembershipMailer(),
 			$this->getLogger()
 		);
@@ -1286,7 +1286,7 @@ 
 		return $this->pimple['paypal-payment-notification-verifier'];
 	}
 
-	public function setPayPalPaymentNotificationVerifier( PaymentNotificationVerifier $verifier ): void {
+	public function setPayPalPaymentNotificationVerifier(PaymentNotificationVerifier $verifier): void {
 		$this->pimple['paypal-payment-notification-verifier'] = $verifier;
 	}
 
@@ -1294,14 +1294,14 @@ 
 		return $this->pimple['paypal-membership-fee-notification-verifier'];
 	}
 
-	public function setPayPalMembershipFeeNotificationVerifier( PaymentNotificationVerifier $verifier ): void {
+	public function setPayPalMembershipFeeNotificationVerifier(PaymentNotificationVerifier $verifier): void {
 		$this->pimple['paypal-membership-fee-notification-verifier'] = $verifier;
 	}
 
-	public function newCreditCardNotificationUseCase( string $updateToken ): CreditCardNotificationUseCase {
+	public function newCreditCardNotificationUseCase(string $updateToken): CreditCardNotificationUseCase {
 		return new CreditCardNotificationUseCase(
 			$this->getDonationRepository(),
-			$this->newDonationAuthorizer( $updateToken ),
+			$this->newDonationAuthorizer($updateToken),
 			$this->getCreditCardService(),
 			$this->newDonationConfirmationMailer(),
 			$this->getLogger(),
@@ -1311,13 +1311,13 @@ 
 
 	public function newCancelMembershipApplicationHtmlPresenter(): CancelMembershipApplicationHtmlPresenter {
 		return new CancelMembershipApplicationHtmlPresenter(
-			$this->getLayoutTemplate( 'Membership_Application_Cancellation_Confirmation.html.twig' )
+			$this->getLayoutTemplate('Membership_Application_Cancellation_Confirmation.html.twig')
 		);
 	}
 
 	public function newMembershipApplicationConfirmationHtmlPresenter(): MembershipApplicationConfirmationHtmlPresenter {
 		return new MembershipApplicationConfirmationHtmlPresenter(
-			$this->getLayoutTemplate( 'Membership_Application_Confirmation.html.twig' )
+			$this->getLayoutTemplate('Membership_Application_Confirmation.html.twig')
 		);
 	}
 
@@ -1327,7 +1327,7 @@ 
 		);
 	}
 
-	public function setCreditCardService( CreditCardService $ccService ): void {
+	public function setCreditCardService(CreditCardService $ccService): void {
 		$this->pimple['credit-card-api-service'] = $ccService;
 	}
 
@@ -1340,7 +1340,7 @@ 
 			new TwigTemplate(
 				$this->getSkinTwig(),
 				'Credit_Card_Payment_Notification.txt.twig',
-				[ 'returnUrl' => $this->config['creditcard']['return-url'] ]
+				['returnUrl' => $this->config['creditcard']['return-url']]
 			)
 		);
 	}
@@ -1359,11 +1359,11 @@ 
 		);
 	}
 
-	public function setDonationTokenGenerator( TokenGenerator $tokenGenerator ): void {
+	public function setDonationTokenGenerator(TokenGenerator $tokenGenerator): void {
 		$this->pimple['donation_token_generator'] = $tokenGenerator;
 	}
 
-	public function setMembershipTokenGenerator( MembershipTokenGenerator $tokenGenerator ): void {
+	public function setMembershipTokenGenerator(MembershipTokenGenerator $tokenGenerator): void {
 		$this->pimple['membership_token_generator'] = $tokenGenerator;
 	}
 
@@ -1386,23 +1386,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(): string {
 		return $this->config['donation-timeframe-limit'];
 	}
 
-	public function newSystemMessageResponse( string $message ): string {
-		return $this->getLayoutTemplate( 'System_Message.html.twig' )
-			->render( [ 'message' => $message ] );
+	public function newSystemMessageResponse(string $message): string {
+		return $this->getLayoutTemplate('System_Message.html.twig')
+			->render(['message' => $message]);
 	}
 
 	public function getMembershipApplicationTimeframeLimit(): string {
@@ -1423,41 +1423,41 @@ 
 
 	public function enablePageCache(): void {
 		$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 ) {	// @codingStandardsIgnoreLine
-		if ( $this->profiler === null ) {
+	private function addProfilingDecorator($objectToDecorate, string $profilingLabel) {	// @codingStandardsIgnoreLine
+		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 ): void {
+	public function setProfiler(Stopwatch $profiler): void {
 		$this->profiler = $profiler;
 	}
 
-	public function setEmailValidator( EmailValidator $validator ): void {
+	public function setEmailValidator(EmailValidator $validator): void {
 		$this->pimple['mail_validator'] = $validator;
 	}
 
-	public function setLogger( LoggerInterface $logger ): void {
+	public function setLogger(LoggerInterface $logger): void {
 		$this->pimple['logger'] = $logger;
 	}
 
-	public function setPaypalLogger( LoggerInterface $logger ): void {
+	public function setPaypalLogger(LoggerInterface $logger): void {
 		$this->pimple['paypal_logger'] = $logger;
 	}
 
-	public function setSofortLogger( LoggerInterface $logger ): void {
+	public function setSofortLogger(LoggerInterface $logger): void {
 		$this->pimple['sofort_logger'] = $logger;
 	}
 
@@ -1466,10 +1466,10 @@ 
 	}
 
 	private function newIbanValidator(): KontoCheckIbanValidator {
-		return new KontoCheckIbanValidator( $this->newBankDataConverter(), $this->config['banned-ibans'] );
+		return new KontoCheckIbanValidator($this->newBankDataConverter(), $this->config['banned-ibans']);
 	}
 
-	public function setFilePrefixer( FilePrefixer $prefixer ): void {
+	public function setFilePrefixer(FilePrefixer $prefixer): void {
 		$this->pimple['cachebusting_fileprefixer'] = $prefixer;
 	}
 
@@ -1479,26 +1479,26 @@ 
 
 	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 ): void {
-		$this->pimple['page_view_tracker'] = function () use ( $tracker )  {
+	public function setPageViewTracker(PageViewTracker $tracker): void {
+		$this->pimple['page_view_tracker'] = function() use ($tracker)  {
 			return $tracker;
 		};
 	}
@@ -1511,25 +1511,25 @@ 
 		// 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'])
 		);
 	}
 
 	public function getI18nDirectory(): string {
-		return $this->getAbsolutePath( $this->config['i18n-base-path'] ) . '/' . $this->config['locale'];
+		return $this->getAbsolutePath($this->config['i18n-base-path']) . '/' . $this->config['locale'];
 	}
 
 	/**
 	 * If the pathname does not start with a slash, make the path absolute to root dir of application
 	 */
-	private function getAbsolutePath( string $path ): string {
-		if ( $path[0] === '/' ) {
+	private function getAbsolutePath(string $path): string {
+		if ($path[0] === '/') {
 			return $path;
 		}
 		return __DIR__ . '/../../' . $path;
 	}
 
-	public function setContentPagePageSelector( PageSelector $pageSelector ): void {
+	public function setContentPagePageSelector(PageSelector $pageSelector): void {
 		$this->pimple['content_page_selector'] = $pageSelector;
 	}
 
@@ -1537,7 +1537,7 @@ 
 		return $this->pimple['content_page_selector'];
 	}
 
-	public function setContentProvider( ContentProvider $contentProvider ): void {
+	public function setContentProvider(ContentProvider $contentProvider): void {
 		$this->pimple['content_provider'] = $contentProvider;
 	}
 
@@ -1555,7 +1555,7 @@ 
 		return $this->pimple['url_generator'];
 	}
 
-	public function setUrlGenerator( UrlGenerator $urlGenerator ): void {
+	public function setUrlGenerator(UrlGenerator $urlGenerator): void {
 		$this->pimple['url_generator'] = $urlGenerator;
 	}
 
@@ -1572,12 +1572,12 @@ 
 	}
 
 	public function newDonationAmountConstraint(): ValidatorConstraint {
-		return new RequiredConstraint( [
-			new TypeConstraint( [ 'type' => 'digit' ] ),
-			new RangeConstraint( [
-				'min' => Euro::newFromInt( $this->config['donation-minimum-amount'] )->getEuroCents(),
-				'max' => Euro::newFromInt( $this->config['donation-maximum-amount'] )->getEuroCents()
-			] )
-		] );
+		return new RequiredConstraint([
+			new TypeConstraint(['type' => 'digit']),
+			new RangeConstraint([
+				'min' => Euro::newFromInt($this->config['donation-minimum-amount'])->getEuroCents(),
+				'max' => Euro::newFromInt($this->config['donation-maximum-amount'])->getEuroCents()
+			])
+		]);
 	}
 }

tests/Integration/Presentation/Presenters/DonationConfirmationHtmlPresenterTest.php

Spacing +16 added lines, -16 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types = 1);
 
 namespace WMDE\Fundraising\Frontend\Tests\Integration\Presentation\Presenters;
 
@@ -31,12 +31,12 @@ 
 		$expectedParameters['donation']['status'] = self::STATUS_BOOKED;
 
 		$presenter = new DonationConfirmationHtmlPresenter(
-			$this->newTwigTemplateMock( $expectedParameters ),
+			$this->newTwigTemplateMock($expectedParameters),
 			new FakeUrlGenerator()
 		);
 
 		$donation = ValidDonation::newBookedAnonymousPayPalDonation();
-		$donation->assignId( self::DONATION_ID );
+		$donation->assignId(self::DONATION_ID);
 
 		$presenter->present(
 			$donation,
@@ -58,7 +58,7 @@ 
 				'paymentType' => 'PPL',
 				'optsIntoNewsletter' => false,
 				'bankTransferCode' => '',
-				'creationDate' => ( new \DateTime() )->format( 'd.m.Y' ),
+				'creationDate' => (new \DateTime())->format('d.m.Y'),
 				'cookieDuration' => '15552000',
 				'updateToken' => self::UPDATE_TOKEN
 			],
@@ -66,29 +66,29 @@ 
 			'bankData' => [],
 			'initialFormValues' => [],
 			'piwikEvents' => [
-				[ 'setCustomVariable', 1, 'Payment', 'some value', PiwikEvents::SCOPE_VISIT ],
-				[ 'trackGoal', 4095 ]
+				['setCustomVariable', 1, 'Payment', 'some value', PiwikEvents::SCOPE_VISIT],
+				['trackGoal', 4095]
 			],
 			'commentUrl' => 'https://such.a.url/AddCommentPage?donationId=42&updateToken=update_token&accessToken=access_token'
 		];
 	}
 
-	private function newTwigTemplateMock( array $expectedParameters ): TwigTemplate {
-		$twig = $this->createMock( TwigTemplate::class );
-		$twig->expects( $this->once() )
-			->method( 'render' )
-			->with( $expectedParameters );
+	private function newTwigTemplateMock(array $expectedParameters): TwigTemplate {
+		$twig = $this->createMock(TwigTemplate::class);
+		$twig->expects($this->once())
+			->method('render')
+			->with($expectedParameters);
 		return $twig;
 	}
 
 	private function newSelectedConfirmationPage(): SelectedConfirmationPage {
-		return $this->createMock( SelectedConfirmationPage::class );
+		return $this->createMock(SelectedConfirmationPage::class);
 	}
 
 	private function newPiwikEvents(): PiwikEvents {
 		$piwikEvents = new PiwikEvents();
-		$piwikEvents->triggerSetCustomVariable( 1, 'some value', PiwikEvents::SCOPE_VISIT );
-		$piwikEvents->triggerTrackGoal( 4095 );
+		$piwikEvents->triggerSetCustomVariable(1, 'some value', PiwikEvents::SCOPE_VISIT);
+		$piwikEvents->triggerTrackGoal(4095);
 		return $piwikEvents;
 	}
 
@@ -97,12 +97,12 @@ 
 		$expectedParameters['donation']['status'] = self::STATUS_UNCONFIRMED;
 
 		$presenter = new DonationConfirmationHtmlPresenter(
-			$this->newTwigTemplateMock( $expectedParameters ),
+			$this->newTwigTemplateMock($expectedParameters),
 			new FakeUrlGenerator()
 		);
 
 		$donation = ValidDonation::newIncompleteAnonymousPayPalDonation();
-		$donation->assignId( self::DONATION_ID );
+		$donation->assignId(self::DONATION_ID);
 
 		$presenter->present(
 			$donation,

app/routes.php

Spacing +197 added lines, -197 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;
@@ -48,96 +48,96 @@ 
 
 $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', // Validates donor information. This route is named badly.
-	function( Request $request ) use ( $app, $ffFactory ) {
-		return ( new ValidateDonorHandler( $ffFactory, $app ) )->handle( $request );
+	function(Request $request) use ($app, $ffFactory) {
+		return (new ValidateDonorHandler($ffFactory, $app))->handle($request);
 	}
 );
 
 $app->post(
 	'validate-donation-amount',
-	function( Request $httpRequest ) use ( $app, $ffFactory ) {
+	function(Request $httpRequest) use ($app, $ffFactory) {
 
-		$constraint = new Collection( [
+		$constraint = new Collection([
 			'allowExtraFields' => false,
 			'fields' => [
 				'amount' => $ffFactory->newDonationAmountConstraint()
 			]
-		] );
+		]);
 
-		$violations = Validation::createValidator()->validate( $httpRequest->request->all(), $constraint );
+		$violations = Validation::createValidator()->validate($httpRequest->request->all(), $constraint);
 
-		if ( $violations->count() > 0 ) {
+		if ($violations->count() > 0) {
 			$mapper = new ConstraintViolationListMapper();
-			return $app->json( [ 'status' => 'ERR', 'messages' => $mapper->map( $violations ) ] );
+			return $app->json(['status' => 'ERR', 'messages' => $mapper->map($violations)]);
 		}
 
-		return $app->json( [ 'status' => 'OK' ] );
+		return $app->json(['status' => 'OK']);
 	}
 );
 
 $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;
@@ -146,10 +146,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)
 			)
 		);
 
@@ -162,130 +162,130 @@ 
 			]
 		);
 	}
-)->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 ) {
+	function($pageName) use ($ffFactory) {
 		$pageSelector = $ffFactory->getContentPagePageSelector();
 
 		try {
-			$pageId = $pageSelector->getPageId( $pageName );
-		} catch ( PageNotFoundException $exception ) {
-			throw new NotFoundHttpException( "Page page name '$pageName' not found." );
+			$pageId = $pageSelector->getPageId($pageName);
+		} catch (PageNotFoundException $exception) {
+			throw new NotFoundHttpException("Page page name '$pageName' not found.");
 		}
 
 		try {
-			return $ffFactory->getLayoutTemplate( 'Display_Page_Layout.twig' )->render( [
+			return $ffFactory->getLayoutTemplate('Display_Page_Layout.twig')->render([
 				'page_id' => $pageId
-			] );
-		} catch ( Twig_Error_Runtime $exception ) {
+			]);
+		} catch (Twig_Error_Runtime $exception) {
 			if ($exception->getPrevious() instanceof ContentNotFoundException) {
-				throw new NotFoundHttpException( "Content for page id '$pageId' not found." );
+				throw new NotFoundHttpException("Content for page id '$pageId' not found.");
 			}
 
 			throw $exception;
 		}
 	}
 )
-->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( 'comment', '' ) ) );
-		$addCommentRequest->setIsPublic( $request->request->get( 'public', '0' ) === '1' );
-		$addCommentRequest->setAuthorDisplayName( trim( $request->request->get( 'displayName', '' ) ) );
-		$addCommentRequest->setDonationId( (int)$request->request->get( 'donationId', '' ) );
+		$addCommentRequest->setCommentText(trim($request->request->get('comment', '')));
+		$addCommentRequest->setIsPublic($request->request->get('public', '0') === '1');
+		$addCommentRequest->setAuthorDisplayName(trim($request->request->get('displayName', '')));
+		$addCommentRequest->setDonationId((int)$request->request->get('donationId', ''));
 		$addCommentRequest->freeze()->assertNoNullFields();
 
-		$updateToken = $request->request->get( 'updateToken', '' );
+		$updateToken = $request->request->get('updateToken', '');
 
-		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->get(
 	'add-comment',
-	function( Request $request ) use ( $app, $ffFactory ) {
+	function(Request $request) use ($app, $ffFactory) {
 		$template = $ffFactory->getLayoutTemplate(
 			'Donation_Comment.html.twig'
 		);
@@ -293,61 +293,61 @@ 
 		return new Response(
 			$template->render(
 				[
-					'donationId' => (int)$request->query->get( 'donationId', '' ),
-					'updateToken' => $request->query->get( 'updateToken', '' ),
+					'donationId' => (int)$request->query->get('donationId', ''),
+					'updateToken' => $request->query->get('updateToken', ''),
 					'cancelUrl' => $app['url_generator']->generate(
 						'show-donation-confirmation',
 						[
-							'id' => (int)$request->query->get( 'donationId', '' ),
-							'accessToken' => $request->query->get( 'accessToken', '' )
+							'id' => (int)$request->query->get('donationId', ''),
+							'accessToken' => $request->query->get('accessToken', '')
 						]
 					)
 				]
 			)
 		);
 	}
-)->bind( 'AddCommentPage' );
+)->bind('AddCommentPage');
 
 $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->get(
 	'contact/get-in-touch',
-	function() use ( $app, $ffFactory ) {
-		return $ffFactory->getLayoutTemplate( 'contact_form.html.twig' )->render( [ ] );
+	function() use ($app, $ffFactory) {
+		return $ffFactory->getLayoutTemplate('contact_form.html.twig')->render([]);
 	}
 )->bind('contact');
 
 $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;
@@ -356,171 +356,171 @@ 
 
 $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(
 	'apply-for-membership',
-	function( Request $request ) use ( $ffFactory ) {
+	function(Request $request) use ($ffFactory) {
 		$params = [];
 
-		if ( $request->query->get('type' ) === 'sustaining' ) {
-			$params['showMembershipTypeOption'] = false ;
+		if ($request->query->get('type') === 'sustaining') {
+			$params['showMembershipTypeOption'] = false;
 		}
 
-		return $ffFactory->getMembershipApplicationFormTemplate()->render( $params );
+		return $ffFactory->getMembershipApplicationFormTemplate()->render($params);
 	}
 );
 
 $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->post(
 	'sofort-payment-notification',
-	function ( Request $request ) use ( $ffFactory ) {
-		return ( new SofortNotificationHandler( $ffFactory ) )->handle( $request );
+	function(Request $request) use ($ffFactory) {
+		return (new SofortNotificationHandler($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;
 			} )
 	);
 
@@ -535,43 +535,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(
 		[
@@ -582,7 +582,7 @@ 
 	);
 } );
 
-$app->get( 'status', function() {
+$app->get('status', function() {
 	return 'Status: OK (Online)';
 } );
 

app/RouteHandlers/ShowDonationConfirmationHandler.php

Spacing +14 added lines, -14 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types = 1);
 
 namespace WMDE\Fundraising\Frontend\App\RouteHandlers;
 
@@ -23,36 +23,36 @@ 
 
 	private $ffFactory;
 
-	public function __construct( FunFunFactory $ffFactory ) {
+	public function __construct(FunFunFactory $ffFactory) {
 		$this->ffFactory = $ffFactory;
 	}
 
-	public function handle( Request $request, array $sessionTrackingData ): Response {
-		$useCase = $this->ffFactory->newShowDonationConfirmationUseCase( $request->get( 'accessToken', '' ) );
+	public function handle(Request $request, array $sessionTrackingData): Response {
+		$useCase = $this->ffFactory->newShowDonationConfirmationUseCase($request->get('accessToken', ''));
 
-		$responseModel = $useCase->showConfirmation( new ShowDonationConfirmationRequest(
-			(int)$request->get( 'id', '' )
-		) );
+		$responseModel = $useCase->showConfirmation(new ShowDonationConfirmationRequest(
+			(int)$request->get('id', '')
+		));
 
-		if ( !$responseModel->accessIsPermitted() ) {
-			throw new AccessDeniedException( 'access_denied_donation_confirmation' );
+		if (!$responseModel->accessIsPermitted()) {
+			throw new AccessDeniedException('access_denied_donation_confirmation');
 		}
 
 		$selectedConfirmationPage = $this->ffFactory->getDonationConfirmationPageSelector()->selectPage();
 		$httpResponse = new Response(
-			$this->ffFactory->newDonationConfirmationPresenter( $selectedConfirmationPage->getPageTitle() )->present(
+			$this->ffFactory->newDonationConfirmationPresenter($selectedConfirmationPage->getPageTitle())->present(
 				$responseModel->getDonation(),
 				$responseModel->getUpdateToken(),
-				$request->get( 'accessToken', '' ),
+				$request->get('accessToken', ''),
 				$selectedConfirmationPage,
-				PiwikVariableCollector::newForDonation( $sessionTrackingData, $responseModel->getDonation() )
+				PiwikVariableCollector::newForDonation($sessionTrackingData, $responseModel->getDonation())
 			)
 		);
 
-		if ( !$request->cookies->get( self::SUBMISSION_COOKIE_NAME ) ) {
+		if (!$request->cookies->get(self::SUBMISSION_COOKIE_NAME)) {
 			$cookie = $this->ffFactory->getCookieBuilder();
 			$httpResponse->headers->setCookie(
-				$cookie->newCookie( self::SUBMISSION_COOKIE_NAME, date( self::TIMESTAMP_FORMAT ) )
+				$cookie->newCookie(self::SUBMISSION_COOKIE_NAME, date(self::TIMESTAMP_FORMAT))
 			);
 		}
 		return $httpResponse;