wmde / FundraisingFrontend

src/Factories/FunFunFactory.php

Spacing +160 added lines, -160 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types = 1);
 
 namespace WMDE\Fundraising\Frontend\Factories;
 
@@ -156,7 +156,7 @@ 
 	private $pimple;
 	private $addDoctrineSubscribers = true;
 
-	public function __construct( array $config ) {
+	public function __construct(array $config) {
 		$this->config = $config;
 		$this->pimple = $this->newPimple();
 	}
@@ -164,102 +164,102 @@ 
 	private function newPimple(): \Pimple {
 		$pimple = new \Pimple();
 
-		$pimple['dbal_connection'] = $pimple->share( function() {
-			return DriverManager::getConnection( $this->config['db'] );
+		$pimple['dbal_connection'] = $pimple->share(function() {
+			return DriverManager::getConnection($this->config['db']);
 		} );
 
-		$pimple['entity_manager'] = $pimple->share( function() {
-			$entityManager = ( new StoreFactory( $this->getConnection() ) )->getEntityManager();
-			if ( $this->addDoctrineSubscribers ) {
-				$entityManager->getEventManager()->addEventSubscriber( $this->newDoctrineDonationPrePersistSubscriber() );
-				$entityManager->getEventManager()->addEventSubscriber( $this->newDoctrineMembershipApplicationPrePersistSubscriber() );
+		$pimple['entity_manager'] = $pimple->share(function() {
+			$entityManager = (new StoreFactory($this->getConnection()))->getEntityManager();
+			if ($this->addDoctrineSubscribers) {
+				$entityManager->getEventManager()->addEventSubscriber($this->newDoctrineDonationPrePersistSubscriber());
+				$entityManager->getEventManager()->addEventSubscriber($this->newDoctrineMembershipApplicationPrePersistSubscriber());
 			}
 
 			return $entityManager;
 		} );
 
-		$pimple['subscription_repository'] = $pimple->share( function() {
+		$pimple['subscription_repository'] = $pimple->share(function() {
 			return new LoggingSubscriptionRepository(
-				new DoctrineSubscriptionRepository( $this->getEntityManager() ),
+				new DoctrineSubscriptionRepository($this->getEntityManager()),
 				$this->getLogger()
 			);
 		} );
 
-		$pimple['donation_repository'] = $pimple->share( function() {
+		$pimple['donation_repository'] = $pimple->share(function() {
 			return new LoggingDonationRepository(
-				new DoctrineDonationRepository( $this->getEntityManager() ),
+				new DoctrineDonationRepository($this->getEntityManager()),
 				$this->getLogger()
 			);
 		} );
 
-		$pimple['membership_application_repository'] = $pimple->share( function() {
+		$pimple['membership_application_repository'] = $pimple->share(function() {
 			return new LoggingMembershipApplicationRepository(
-				new DoctrineMembershipApplicationRepository( $this->getEntityManager() ),
+				new DoctrineMembershipApplicationRepository($this->getEntityManager()),
 				$this->getLogger()
 			);
 		} );
 
-		$pimple['comment_repository'] = $pimple->share( function() {
+		$pimple['comment_repository'] = $pimple->share(function() {
 			return new LoggingCommentFinder(
-				new DoctrineCommentFinder( $this->getEntityManager() ),
+				new DoctrineCommentFinder($this->getEntityManager()),
 				$this->getLogger()
 			);
 		} );
 
-		$pimple['mail_validator'] = $pimple->share( function() {
-			return new EmailValidator( new InternetDomainNameValidator() );
+		$pimple['mail_validator'] = $pimple->share(function() {
+			return new EmailValidator(new InternetDomainNameValidator());
 		} );
 
-		$pimple['subscription_validator'] = $pimple->share( function() {
+		$pimple['subscription_validator'] = $pimple->share(function() {
 			return new SubscriptionValidator(
 				$this->getEmailValidator(),
-				$this->getTextPolicyValidator( 'fields' ),
+				$this->getTextPolicyValidator('fields'),
 				$this->newSubscriptionDuplicateValidator(),
 				$this->newHonorificValidator()
 			);
 		} );
 
-		$pimple['template_name_validator'] = $pimple->share( function() {
-			return new TemplateNameValidator( $this->getTwig() );
+		$pimple['template_name_validator'] = $pimple->share(function() {
+			return new TemplateNameValidator($this->getTwig());
 		} );
 
-		$pimple['contact_validator'] = $pimple->share( function() {
-			return new GetInTouchValidator( $this->getEmailValidator() );
+		$pimple['contact_validator'] = $pimple->share(function() {
+			return new GetInTouchValidator($this->getEmailValidator());
 		} );
 
-		$pimple['greeting_generator'] = $pimple->share( function() {
+		$pimple['greeting_generator'] = $pimple->share(function() {
 			return new GreetingGenerator();
 		} );
 
-		$pimple['mw_api'] = $pimple->share( function() {
+		$pimple['mw_api'] = $pimple->share(function() {
 			return new MediawikiApi(
 				$this->config['cms-wiki-api-url'],
 				$this->getGuzzleClient()
 			);
 		} );
 
-		$pimple['guzzle_client'] = $pimple->share( function() {
+		$pimple['guzzle_client'] = $pimple->share(function() {
 			$middlewareFactory = new MiddlewareFactory();
-			$middlewareFactory->setLogger( $this->getLogger() );
+			$middlewareFactory->setLogger($this->getLogger());
 
-			$handlerStack = HandlerStack::create( new CurlHandler() );
-			$handlerStack->push( $middlewareFactory->retry() );
+			$handlerStack = HandlerStack::create(new CurlHandler());
+			$handlerStack->push($middlewareFactory->retry());
 
-			return new Client( [
+			return new Client([
 				'cookies' => true,
 				'handler' => $handlerStack,
-				'headers' => [ 'User-Agent' => 'WMDE Fundraising Frontend' ],
-			] );
+				'headers' => ['User-Agent' => 'WMDE Fundraising Frontend'],
+			]);
 		} );
 
-		$pimple['translator'] = $pimple->share( function() {
+		$pimple['translator'] = $pimple->share(function() {
 			$translationFactory = new TranslationFactory();
 			$loaders = [
 				'json' => $translationFactory->newJsonLoader()
 			];
 			$locale = $this->config['locale'];
-			$translator = $translationFactory->create( $loaders, $locale );
-			$translator->addResource( 'json', __DIR__ . '/../../app/translations/messages.' . $locale . '.json', $locale );
+			$translator = $translationFactory->create($loaders, $locale);
+			$translator->addResource('json', __DIR__ . '/../../app/translations/messages.' . $locale . '.json', $locale);
 			$translator->addResource(
 				'json',
 				__DIR__ . '/../../app/translations/paymentTypes.' . $locale . '.json',
@@ -272,55 +272,55 @@ 
 				$locale,
 				'paymentIntervals'
 			);
-			$translator->addResource( 'json', __DIR__ . '/../../app/translations/validations.' . $locale . '.json', $locale,
-				'validations' );
+			$translator->addResource('json', __DIR__ . '/../../app/translations/validations.' . $locale . '.json', $locale,
+				'validations');
 			return $translator;
 		} );
 
 		// In the future, this could be locale-specific or filled from a DB table
-		$pimple['honorifics'] = $pimple->share( function() {
-			return new Honorifics( [
+		$pimple['honorifics'] = $pimple->share(function() {
+			return new Honorifics([
 				'' => 'Kein Titel',
 				'Dr.' => 'Dr.',
 				'Prof.' => 'Prof.',
 				'Prof. Dr.' => 'Prof. Dr.'
-			] );
+			]);
 		} );
 
-		$pimple['twig_factory'] = $pimple->share( function () {
-			return new TwigFactory( $this->config['twig'] );
+		$pimple['twig_factory'] = $pimple->share(function() {
+			return new TwigFactory($this->config['twig']);
 		} );
 
-		$pimple['twig'] = $pimple->share( function() {
+		$pimple['twig'] = $pimple->share(function() {
 			$twigFactory = $this->getTwigFactory();
-			$loaders = array_filter( [
+			$loaders = array_filter([
 				$twigFactory->newFileSystemLoader(),
 				$twigFactory->newArrayLoader(), // This is just a fallback for testing
-				$twigFactory->newWikiPageLoader( $this->newWikiContentProvider() ),
-			] );
+				$twigFactory->newWikiPageLoader($this->newWikiContentProvider()),
+			]);
 			$extensions = [
-				$twigFactory->newTranslationExtension( $this->getTranslator() ),
+				$twigFactory->newTranslationExtension($this->getTranslator()),
 				new Twig_Extensions_Extension_Intl()
 			];
-			return $twigFactory->create( $loaders, $extensions );
+			return $twigFactory->create($loaders, $extensions);
 		} );
 
-		$pimple['logger'] = $pimple->share( function() {
-			$logger = new Logger( 'WMDE Fundraising Frontend logger' );
+		$pimple['logger'] = $pimple->share(function() {
+			$logger = new Logger('WMDE Fundraising Frontend logger');
 
-			$streamHandler = new StreamHandler( $this->newLoggerPath( ( new \DateTime() )->format( 'Y-m-d\TH:i:s\Z' ) ) );
-			$bufferHandler = new BufferHandler( $streamHandler, 500, Logger::DEBUG, true, true );
-			$streamHandler->setFormatter( new LineFormatter( "%message%\n" ) );
-			$logger->pushHandler( $bufferHandler );
+			$streamHandler = new StreamHandler($this->newLoggerPath((new \DateTime())->format('Y-m-d\TH:i:s\Z')));
+			$bufferHandler = new BufferHandler($streamHandler, 500, Logger::DEBUG, true, true);
+			$streamHandler->setFormatter(new LineFormatter("%message%\n"));
+			$logger->pushHandler($bufferHandler);
 
-			$errorHandler = new StreamHandler( $this->newLoggerPath( 'error' ), Logger::ERROR );
-			$errorHandler->setFormatter( new JsonFormatter() );
-			$logger->pushHandler( $errorHandler );
+			$errorHandler = new StreamHandler($this->newLoggerPath('error'), Logger::ERROR);
+			$errorHandler->setFormatter(new JsonFormatter());
+			$logger->pushHandler($errorHandler);
 
 			return $logger;
 		} );
 
-		$pimple['messenger'] = $pimple->share( function() {
+		$pimple['messenger'] = $pimple->share(function() {
 			return new Messenger(
 				new Swift_MailTransport(),
 				$this->getOperatorAddress(),
@@ -328,11 +328,11 @@ 
 			);
 		} );
 
-		$pimple['confirmation-page-selector'] = $pimple->share( function() {
-			return new DonationConfirmationPageSelector( $this->config['confirmation-pages'] );
+		$pimple['confirmation-page-selector'] = $pimple->share(function() {
+			return new DonationConfirmationPageSelector($this->config['confirmation-pages']);
 		} );
 
-		$pimple['paypal-payment-notification-verifier'] = $pimple->share( function() {
+		$pimple['paypal-payment-notification-verifier'] = $pimple->share(function() {
 			return new LoggingPaymentNotificationVerifier(
 				new PayPalPaymentNotificationVerifier(
 					new Client(),
@@ -342,7 +342,7 @@ 
 			);
 		} );
 
-		$pimple['credit-card-api-service'] = $pimple->share( function() {
+		$pimple['credit-card-api-service'] = $pimple->share(function() {
 			return new McpCreditCardService(
 				new TNvpServiceDispatcher(
 					'IMcpCreditcardService_v1_5',
@@ -353,10 +353,10 @@ 
 			);
 		} );
 
-		$pimple['token_generator'] = $pimple->share( function() {
+		$pimple['token_generator'] = $pimple->share(function() {
 			return new RandomTokenGenerator(
 				$this->config['token-length'],
-				new \DateInterval( $this->config['token-validity-timestamp'] )
+				new \DateInterval($this->config['token-validity-timestamp'])
 			);
 		} );
 
@@ -373,17 +373,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 {
@@ -391,14 +391,14 @@ 
 	}
 
 	public function newCommentListRssPresenter(): CommentListRssPresenter {
-		return new CommentListRssPresenter( new TwigTemplate(
+		return new CommentListRssPresenter(new TwigTemplate(
 			$this->getTwig(),
 			'CommentList.rss.twig'
-		) );
+		));
 	}
 
 	public function newCommentListHtmlPresenter(): CommentListHtmlPresenter {
-		return new CommentListHtmlPresenter( $this->getLayoutTemplate( 'CommentList.html.twig' ) );
+		return new CommentListHtmlPresenter($this->getLayoutTemplate('CommentList.html.twig'));
 	}
 
 	private function getCommentFinder(): CommentFinder {
@@ -409,7 +409,7 @@ 
 		return $this->pimple['subscription_repository'];
 	}
 
-	public function setSubscriptionRepository( SubscriptionRepository $subscriptionRepository ) {
+	public function setSubscriptionRepository(SubscriptionRepository $subscriptionRepository) {
 		$this->pimple['subscription_repository'] = $subscriptionRepository;
 	}
 
@@ -432,26 +432,26 @@ 
 	}
 
 	public function newDisplayPagePresenter(): DisplayPagePresenter {
-		return new DisplayPagePresenter( $this->getLayoutTemplate( 'DisplayPageLayout.twig' ) );
+		return new DisplayPagePresenter($this->getLayoutTemplate('DisplayPageLayout.twig'));
 	}
 
 	public function newAddSubscriptionHTMLPresenter(): AddSubscriptionHtmlPresenter {
-		return new AddSubscriptionHtmlPresenter( $this->getIncludeTemplate( 'Subscription_Form.twig' ), $this->getTranslator() );
+		return new AddSubscriptionHtmlPresenter($this->getIncludeTemplate('Subscription_Form.twig'), $this->getTranslator());
 	}
 
 	public function newConfirmSubscriptionHtmlPresenter(): ConfirmSubscriptionHtmlPresenter {
 		return new ConfirmSubscriptionHtmlPresenter(
-			$this->getLayoutTemplate( 'ConfirmSubscription.html.twig' ),
+			$this->getLayoutTemplate('ConfirmSubscription.html.twig'),
 			$this->getTranslator()
 		);
 	}
 
 	public function newAddSubscriptionJSONPresenter(): AddSubscriptionJsonPresenter {
-		return new AddSubscriptionJsonPresenter( $this->getTranslator() );
+		return new AddSubscriptionJsonPresenter($this->getTranslator());
 	}
 
 	public function newGetInTouchHTMLPresenter(): GetInTouchHtmlPresenter {
-		return new GetInTouchHtmlPresenter( $this->getIncludeTemplate( 'Kontaktformular.twig' ), $this->getTranslator() );
+		return new GetInTouchHtmlPresenter($this->getIncludeTemplate('Kontaktformular.twig'), $this->getTranslator());
 	}
 
 	public function getTwig(): Twig_Environment {
@@ -464,7 +464,7 @@ 
 	 * @param string $templateName
 	 * @return TwigTemplate
 	 */
-	private function getLayoutTemplate( string $templateName ): TwigTemplate {
+	private function getLayoutTemplate(string $templateName): TwigTemplate {
 		 return new TwigTemplate(
 			$this->getTwig(),
 			$templateName,
@@ -478,13 +478,13 @@ 
 	 * @param string $templateName Template to include
 	 * @return TwigTemplate
 	 */
-	private function getIncludeTemplate( string $templateName ): TwigTemplate {
+	private function getIncludeTemplate(string $templateName): TwigTemplate {
 		return new TwigTemplate(
 			$this->getTwig(),
 			'IncludeInLayout.twig',
 			array_merge(
 				$this->getDefaultTwigVariables(),
-				[ 'main_template' => $templateName]
+				['main_template' => $templateName]
 			)
 		);
 	}
@@ -509,7 +509,7 @@ 
 	private function newPageRetriever(): PageRetriever {
 		return new ApiBasedPageRetriever(
 			$this->getMediaWikiApi(),
-			new ApiUser( $this->config['cms-wiki-user'], $this->config['cms-wiki-password'] ),
+			new ApiUser($this->config['cms-wiki-user'], $this->config['cms-wiki-password']),
 			$this->getLogger()
 		);
 	}
@@ -518,7 +518,7 @@ 
 		return $this->pimple['mw_api'];
 	}
 
-	public function setMediaWikiApi( MediawikiApi $api ) {
+	public function setMediaWikiApi(MediawikiApi $api) {
 		$this->pimple['mw_api'] = $api;
 	}
 
@@ -538,7 +538,7 @@ 
 		return $this->pimple['logger'];
 	}
 
-	private function newLoggerPath( string $fileName ): string {
+	private function newLoggerPath(string $fileName): string {
 		return __DIR__ . '/../../var/log/' . $fileName . '.log';
 	}
 
@@ -582,20 +582,20 @@ 
 			new TwigTemplate(
 					$this->getTwig(),
 					'Mail_Subscription_Confirmation.twig',
-					[ 'greeting_generator' => $this->getGreetingGenerator() ]
+					['greeting_generator' => $this->getGreetingGenerator()]
 			),
 			'mail_subject_membership'
 		);
 	}
 
-	private function newTemplateMailer( TwigTemplate $template, string $messageKey ): TemplateBasedMailer {
+	private function newTemplateMailer(TwigTemplate $template, string $messageKey): TemplateBasedMailer {
 		$mailer = new TemplateBasedMailer(
 			$this->getMessenger(),
 			$template,
-			$this->getTranslator()->trans( $messageKey )
+			$this->getTranslator()->trans($messageKey)
 		);
 
-		return new LoggingMailer( $mailer, $this->getLogger() );
+		return new LoggingMailer($mailer, $this->getLogger());
 	}
 
 	public function getGreetingGenerator() {
@@ -603,11 +603,11 @@ 
 	}
 
 	public function newCheckIbanUseCase(): CheckIbanUseCase {
-		return new CheckIbanUseCase( $this->newBankDataConverter() );
+		return new CheckIbanUseCase($this->newBankDataConverter());
 	}
 
 	public function newGenerateIbanUseCase(): GenerateIbanUseCase {
-		return new GenerateIbanUseCase( $this->newBankDataConverter() );
+		return new GenerateIbanUseCase($this->newBankDataConverter());
 	}
 
 	public function newIbanPresenter(): IbanPresenter {
@@ -615,14 +615,14 @@ 
 	}
 
 	public function newBankDataConverter() {
-		return new BankDataConverter( $this->config['bank-data-file'] );
+		return new BankDataConverter($this->config['bank-data-file']);
 	}
 
-	public function setSubscriptionValidator( SubscriptionValidator $subscriptionValidator ) {
+	public function setSubscriptionValidator(SubscriptionValidator $subscriptionValidator) {
 		$this->pimple['subscription_validator'] = $subscriptionValidator;
 	}
 
-	public function setPageTitlePrefix( string $prefix ) {
+	public function setPageTitlePrefix(string $prefix) {
 		$this->config['cms-wiki-title-prefix'] = $prefix;
 	}
 
@@ -636,7 +636,7 @@ 
 
 	private function newContactConfirmationMailer(): TemplateBasedMailer {
 		return $this->newTemplateMailer(
-			new TwigTemplate( $this->getTwig(), 'KontaktMailExtern.twig' ),
+			new TwigTemplate($this->getTwig(), 'KontaktMailExtern.twig'),
 			'mail_subject_getintouch'
 		);
 	}
@@ -654,12 +654,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 {
@@ -667,45 +667,45 @@ 
 	}
 
 	private function newPaymentTypeValidator(): AllowedValuesValidator {
-		return new AllowedValuesValidator( PaymentType::getPaymentTypes() );
+		return new AllowedValuesValidator(PaymentType::getPaymentTypes());
 	}
 
 	private function newBankDataValidator(): BankDataValidator {
-		return new BankDataValidator( new IbanValidator( $this->newBankDataConverter() ) );
+		return new BankDataValidator(new IbanValidator($this->newBankDataConverter()));
 	}
 
 	private function getMessenger(): Messenger {
 		return $this->pimple['messenger'];
 	}
 
-	public function setMessenger( Messenger $messenger ) {
+	public function setMessenger(Messenger $messenger) {
 		$this->pimple['messenger'] = $messenger;
 	}
 
 	public function setNullMessenger() {
-		$this->setMessenger( new Messenger(
+		$this->setMessenger(new Messenger(
 			Swift_NullTransport::newInstance(),
 			$this->getOperatorAddress()
-		) );
+		));
 	}
 
 	public function getOperatorAddress() {
-		return new EmailAddress( $this->config['operator-email'] );
+		return new EmailAddress($this->config['operator-email']);
 	}
 
 	public function newInternalErrorHTMLPresenter(): InternalErrorHtmlPresenter {
-		return new InternalErrorHtmlPresenter( $this->getIncludeTemplate( 'ErrorPage.twig' ) );
+		return new InternalErrorHtmlPresenter($this->getIncludeTemplate('ErrorPage.twig'));
 	}
 
 	public function newAccessDeniedHTMLPresenter(): InternalErrorHtmlPresenter {
-		return new InternalErrorHtmlPresenter( $this->getLayoutTemplate( 'AccessDenied.twig' ) );
+		return new InternalErrorHtmlPresenter($this->getLayoutTemplate('AccessDenied.twig'));
 	}
 
 	public function getTranslator(): TranslatorInterface {
 		return $this->pimple['translator'];
 	}
 
-	public function setTranslator( TranslatorInterface $translator ) {
+	public function setTranslator(TranslatorInterface $translator) {
 		$this->pimple['translator'] = $translator;
 	}
 
@@ -713,40 +713,40 @@ 
 		return $this->pimple['twig_factory'];
 	}
 
-	private function getTextPolicyValidator( $policyName ) {
+	private function getTextPolicyValidator($policyName) {
 		$policyValidator = new TextPolicyValidator();
 
 		$contentProvider = $this->newWikiContentProvider();
 		$textPolicyConfig = $this->config['text-policies'][$policyName];
 
 		// TODO: this is not the place to retrieve resources over the network
-		$policyValidator->addBadWordsFromArray( $this->loadWordsFromWiki(
+		$policyValidator->addBadWordsFromArray($this->loadWordsFromWiki(
 			$contentProvider,
 			$textPolicyConfig['badwords'] ?? ''
-		) );
-		$policyValidator->addWhiteWordsFromArray( $this->loadWordsFromWiki(
+		));
+		$policyValidator->addWhiteWordsFromArray($this->loadWordsFromWiki(
 			$contentProvider,
 			$textPolicyConfig['whitewords'] ?? ''
-		) );
+		));
 
 		return $policyValidator;
 	}
 
-	private function loadWordsFromWiki( WikiContentProvider $contentProvider, string $pageName ): array {
-		if ( $pageName === '' ) {
-			return [ ];
+	private function loadWordsFromWiki(WikiContentProvider $contentProvider, string $pageName): array {
+		if ($pageName === '') {
+			return [];
 		}
-		$content = $contentProvider->getContent( $pageName, 'raw' );
-		$words = array_map( 'trim', explode( "\n", $content ) );
+		$content = $contentProvider->getContent($pageName, 'raw');
+		$words = array_map('trim', explode("\n", $content));
 
-		return array_filter( $words );
+		return array_filter($words);
 	}
 
-	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()
 		);
 	}
@@ -756,7 +756,7 @@ 
 			new TwigTemplate(
 				$this->getTwig(),
 				'Mail_Donation_Cancellation_Confirmation.twig',
-				[ 'greeting_generator' => $this->getGreetingGenerator() ]
+				['greeting_generator' => $this->getGreetingGenerator()]
 			),
 			'mail_subject_confirm_cancellation'
 		);
@@ -814,19 +814,19 @@ 
 	}
 
 	public function newPayPalUrlGenerator() {
-		return new PayPalUrlGenerator( $this->getPayPalUrlConfig() );
+		return new PayPalUrlGenerator($this->getPayPalUrlConfig());
 	}
 
 	private function getPayPalUrlConfig() {
-		return PayPalUrlConfig::newFromConfig( $this->config['paypal'] );
+		return PayPalUrlConfig::newFromConfig($this->config['paypal']);
 	}
 
 	private function newCreditCardUrlGenerator() {
-		return new CreditCardUrlGenerator( $this->newCreditCardUrlConfig() );
+		return new CreditCardUrlGenerator($this->newCreditCardUrlConfig());
 	}
 
 	private function newCreditCardUrlConfig() {
-		return CreditCardUrlConfig::newFromConfig( $this->config['creditcard'] );
+		return CreditCardUrlConfig::newFromConfig($this->config['creditcard']);
 	}
 
 	public function getDonationRepository(): DonationRepository {
@@ -844,22 +844,22 @@ 
 	}
 
 	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->getTextPolicyValidator( 'comment' )
+			$this->newDonationAuthorizer($updateToken),
+			$this->getTextPolicyValidator('comment')
 		);
 	}
 
-	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,
@@ -873,13 +873,13 @@ 
 
 	public function newDonationConfirmationPresenter() {
 		return new DonationConfirmationHtmlPresenter(
-			$this->getIncludeTemplate( 'DonationConfirmation.twig' )
+			$this->getIncludeTemplate('DonationConfirmation.twig')
 		);
 	}
 
 	public function newCreditCardPaymentHtmlPresenter() {
 		return new CreditCardPaymentHtmlPresenter(
-			$this->getIncludeTemplate( 'CreditCardPaymentIframe.twig' ),
+			$this->getIncludeTemplate('CreditCardPaymentIframe.twig'),
 			$this->getTranslator(),
 			$this->newCreditCardUrlGenerator()
 		);
@@ -887,7 +887,7 @@ 
 
 	public function newCancelDonationHtmlPresenter() {
 		return new CancelDonationHtmlPresenter(
-			$this->getIncludeTemplate( 'Donation_Cancellation_Confirmation.twig' )
+			$this->getIncludeTemplate('Donation_Cancellation_Confirmation.twig')
 		);
 	}
 
@@ -906,7 +906,7 @@ 
 			new TwigTemplate(
 				$this->getTwig(),
 				'Mail_Membership_Application_Confirmation.twig',
-				[ 'greeting_generator' => $this->getGreetingGenerator() ]
+				['greeting_generator' => $this->getGreetingGenerator()]
 			),
 			'mail_subject_confirm_membership_application'
 		);
@@ -921,12 +921,12 @@ 
 	}
 
 	private function newMembershipApplicationTracker(): MembershipApplicationTracker {
-		return new DoctrineMembershipApplicationTracker( $this->getEntityManager() );
+		return new DoctrineMembershipApplicationTracker($this->getEntityManager());
 	}
 
-	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()
 		);
@@ -951,27 +951,27 @@ 
 			new TwigTemplate(
 				$this->getTwig(),
 				'Mail_Membership_Application_Cancellation_Confirmation.twig',
-				[ 'greeting_generator' => $this->getGreetingGenerator() ]
+				['greeting_generator' => $this->getGreetingGenerator()]
 			),
 			'mail_subject_confirm_membership_application_cancellation'
 		);
 	}
 
-	public function newMembershipApplicationConfirmationUseCase( string $accessToken ) {
+	public function newMembershipApplicationConfirmationUseCase(string $accessToken) {
 		return new ShowMembershipApplicationConfirmationUseCase(
-			$this->newMembershipApplicationAuthorizer( null, $accessToken ), $this->getMembershipApplicationRepository(),
+			$this->newMembershipApplicationAuthorizer(null, $accessToken), $this->getMembershipApplicationRepository(),
 			$this->newMembershipApplicationTokenFetcher()
 		);
 	}
 
-	public function newShowDonationConfirmationUseCase( string $accessToken ): ShowDonationConfirmationUseCase {
+	public function newShowDonationConfirmationUseCase(string $accessToken): ShowDonationConfirmationUseCase {
 		return new ShowDonationConfirmationUseCase(
-			$this->newDonationAuthorizer( null, $accessToken ),
+			$this->newDonationAuthorizer(null, $accessToken),
 			$this->getDonationRepository()
 		);
 	}
 
-	public function setDonationConfirmationPageSelector( DonationConfirmationPageSelector $selector ) {
+	public function setDonationConfirmationPageSelector(DonationConfirmationPageSelector $selector) {
 		$this->pimple['confirmation-page-selector'] = $selector;
 	}
 
@@ -980,17 +980,17 @@ 
 	}
 
 	public function newDonationFormViolationPresenter() {
-		$template = $this->getLayoutTemplate( 'DisplayPageLayout.twig' );
+		$template = $this->getLayoutTemplate('DisplayPageLayout.twig');
 		// TODO make this dependent on the 'form' value from the HTTP POST request
 		// (we need different form pages for A/B testing)
 		$template->context['main_template'] = 'DonationForm.twig';
-		return new DonationFormViolationPresenter( $template, $this->newAmountFormatter() );
+		return new DonationFormViolationPresenter($template, $this->newAmountFormatter());
 	}
 
-	public function newHandlePayPalPaymentNotificationUseCase( string $updateToken ) {
+	public function newHandlePayPalPaymentNotificationUseCase(string $updateToken) {
 		return new HandlePayPalPaymentNotificationUseCase(
 			$this->getDonationRepository(),
-			$this->newDonationAuthorizer( $updateToken ),
+			$this->newDonationAuthorizer($updateToken),
 			$this->newDonationConfirmationMailer(),
 			$this->getLogger(),
 			$this->newDonationEventLogger()
@@ -1001,14 +1001,14 @@ 
 		return $this->pimple['paypal-payment-notification-verifier'];
 	}
 
-	public function setPayPalPaymentNotificationVerifier( PaymentNotificationVerifier $verifier ) {
+	public function setPayPalPaymentNotificationVerifier(PaymentNotificationVerifier $verifier) {
 		$this->pimple['paypal-payment-notification-verifier'] = $verifier;
 	}
 
-	public function newCreditCardNotificationUseCase( string $updateToken ) {
+	public function newCreditCardNotificationUseCase(string $updateToken) {
 		return new CreditCardNotificationUseCase(
 			$this->getDonationRepository(),
-			$this->newDonationAuthorizer( $updateToken ),
+			$this->newDonationAuthorizer($updateToken),
 			$this->getCreditCardService(),
 			$this->newDonationConfirmationMailer(),
 			$this->getLogger(),
@@ -1018,23 +1018,23 @@ 
 
 	public function newCancelMembershipApplicationHtmlPresenter() {
 		return new CancelMembershipApplicationHtmlPresenter(
-			$this->getIncludeTemplate( 'Membership_Application_Cancellation_Confirmation.twig' )
+			$this->getIncludeTemplate('Membership_Application_Cancellation_Confirmation.twig')
 		);
 	}
 
 	public function newMembershipApplicationConfirmationHtmlPresenter() {
 		return new MembershipApplicationConfirmationHtmlPresenter(
-			$this->getIncludeTemplate( 'MembershipApplicationConfirmation.twig' )
+			$this->getIncludeTemplate('MembershipApplicationConfirmation.twig')
 		);
 	}
 
 	public function newMembershipFormViolationPresenter() {
 		return new MembershipFormViolationPresenter(
-			$this->getIncludeTemplate( 'MembershipApplication.twig' )
+			$this->getIncludeTemplate('MembershipApplication.twig')
 		);
 	}
 
-	public function setCreditCardService( CreditCardService $ccService ) {
+	public function setCreditCardService(CreditCardService $ccService) {
 		$this->pimple['credit-card-api-service'] = $ccService;
 	}
 
@@ -1047,7 +1047,7 @@ 
 			new TwigTemplate(
 				$this->getTwig(),
 				'CreditCardPaymentNotification.twig',
-				[ 'returnUrl' => $this->config['creditcard']['return-url'] ]
+				['returnUrl' => $this->config['creditcard']['return-url']]
 			)
 		);
 	}
@@ -1068,7 +1068,7 @@ 
 		);
 	}
 
-	public function setTokenGenerator( TokenGenerator $tokenGenerator ) {
+	public function setTokenGenerator(TokenGenerator $tokenGenerator) {
 		$this->pimple['token_generator'] = $tokenGenerator;
 	}
 
@@ -1091,22 +1091,22 @@ 
 	private function newDonationPolicyValidator(): AddDonationPolicyValidator {
 		return new AddDonationPolicyValidator(
 			$this->newDonationAmountPolicyValidator(),
-			$this->getTextPolicyValidator( 'fields' )
+			$this->getTextPolicyValidator('fields')
 		);
 	}
 
 	private function newDonationAmountPolicyValidator(): AmountPolicyValidator {
 		// in the future, this might come from the configuration
-		return new AmountPolicyValidator( 1000, 200, 300 );
+		return new AmountPolicyValidator(1000, 200, 300);
 	}
 
 	public function getDonationTimeframeLimit() {
 		return $this->config['donation-timeframe-limit'];
 	}
 
-	public function newSystemMessageResponse( string $message ) {
-		$test = $this->getIncludeTemplate( 'System_Message.twig' );
-		return $test->render( [ 'message' => $message ] );
+	public function newSystemMessageResponse(string $message) {
+		$test = $this->getIncludeTemplate('System_Message.twig');
+		return $test->render(['message' => $message]);
 	}
 
 	public function getMembershipApplicationTimeframeLimit() {