wmde / FundraisingFrontend

src/Factories/FunFunFactory.php

Spacing +159 added lines, -159 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types = 1);
 
 namespace WMDE\Fundraising\Frontend\Factories;
 
@@ -165,7 +165,7 @@ 
 	 */
 	private $profiler = null;
 
-	public function __construct( array $config ) {
+	public function __construct(array $config) {
 		$this->config = $config;
 		$this->pimple = $this->newPimple();
 	}
@@ -173,113 +173,113 @@ 
 	private function newPimple(): \Pimple {
 		$pimple = new \Pimple();
 
-		$pimple['logger'] = $pimple->share( function() {
+		$pimple['logger'] = $pimple->share(function() {
 			return new NullLogger();
 		} );
 
-		$pimple['profiler_data_collector'] = $pimple->share( function() {
+		$pimple['profiler_data_collector'] = $pimple->share(function() {
 			return new ProfilerDataCollector();
 		} );
 
-		$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 LoggingApplicationRepository(
-				new DoctrineApplicationRepository( $this->getEntityManager() ),
+				new DoctrineApplicationRepository($this->getEntityManager()),
 				$this->getLogger()
 			);
 		} );
 
-		$pimple['comment_repository'] = $pimple->share( function() {
+		$pimple['comment_repository'] = $pimple->share(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'] = $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->newTextPolicyValidator( 'fields' ),
+				$this->newTextPolicyValidator('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());
 
-			$guzzle = new Client( [
+			$guzzle = new Client([
 				'cookies' => true,
 				'handler' => $handlerStack,
-				'headers' => [ 'User-Agent' => 'WMDE Fundraising Frontend' ],
-			] );
+				'headers' => ['User-Agent' => 'WMDE Fundraising Frontend'],
+			]);
 
-			return $this->addProfilingDecorator( $guzzle, 'Guzzle Client' );
+			return $this->addProfilingDecorator($guzzle, 'Guzzle Client');
 		} );
 
-		$pimple['translator'] = $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 = $translationFactory->create($loaders, $locale);
 			$translator->addResource(
 				'json',
 				__DIR__ . '/../../app/translations/messages.' . $locale . '.json',
@@ -318,36 +318,36 @@ 
 		} );
 
 		// 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 () {
+		$pimple['twig_factory'] = $pimple->share(function() {
 			// TODO: like this we end up with two Twig instance, one created here and on in the framework
-			return new TwigFactory( $this->config['twig'], $this->getCachePath() . '/twig' );
+			return new TwigFactory($this->config['twig'], $this->getCachePath() . '/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->newWikiPageRetriever() ),
-			] );
+				$twigFactory->newWikiPageLoader($this->newWikiPageRetriever()),
+			]);
 			$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['messenger'] = $pimple->share( function() {
+		$pimple['messenger'] = $pimple->share(function() {
 			return new Messenger(
 				new Swift_MailTransport(),
 				$this->getOperatorAddress(),
@@ -355,11 +355,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(),
@@ -369,7 +369,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',
@@ -380,14 +380,14 @@ 
 			);
 		} );
 
-		$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'])
 			);
 		} );
 
-		$pimple['page_cache'] = $pimple->share( function() {
+		$pimple['page_cache'] = $pimple->share(function() {
 			return new VoidCache();
 		} );
 
@@ -404,17 +404,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 {
@@ -422,14 +422,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', [ 'piwikGoals' => [ 1 ] ] ) );
+		return new CommentListHtmlPresenter($this->getLayoutTemplate('CommentList.html.twig', ['piwikGoals' => [1]]));
 	}
 
 	private function getCommentFinder(): CommentFinder {
@@ -440,7 +440,7 @@ 
 		return $this->pimple['subscription_repository'];
 	}
 
-	public function setSubscriptionRepository( SubscriptionRepository $subscriptionRepository ) {
+	public function setSubscriptionRepository(SubscriptionRepository $subscriptionRepository) {
 		$this->pimple['subscription_repository'] = $subscriptionRepository;
 	}
 
@@ -457,22 +457,22 @@ 
 	}
 
 	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 {
@@ -486,11 +486,11 @@ 
 	 * @param array $context Additional variables for the template
 	 * @return TwigTemplate
 	 */
-	public function getLayoutTemplate( string $templateName, array $context = [] ): TwigTemplate {
+	public function getLayoutTemplate(string $templateName, array $context = []): TwigTemplate {
 		 return new TwigTemplate(
 			$this->getTwig(),
 			$templateName,
-			array_merge( $this->getDefaultTwigVariables(), $context )
+			array_merge($this->getDefaultTwigVariables(), $context)
 		);
 	}
 
@@ -500,13 +500,13 @@ 
 	 * @param string $templateName Template to include
 	 * @return TwigTemplate
 	 */
-	private function getIncludeTemplate( string $templateName, array $context = [] ): TwigTemplate {
+	private function getIncludeTemplate(string $templateName, array $context = []): TwigTemplate {
 		return new TwigTemplate(
 			$this->getTwig(),
 			'IncludeInLayout.twig',
 			array_merge(
 				$this->getDefaultTwigVariables(),
-				[ 'main_template' => $templateName ],
+				['main_template' => $templateName],
 				$context
 			)
 		);
@@ -534,7 +534,7 @@ 
 		return $this->pimple['mw_api'];
 	}
 
-	public function setMediaWikiApi( MediawikiApi $api ) {
+	public function setMediaWikiApi(MediawikiApi $api) {
 		$this->pimple['mw_api'] = $api;
 	}
 
@@ -545,7 +545,7 @@ 
 	private function newWikiPageRetriever(): PageRetriever {
 		$PageRetriever = $this->newCachedPageRetriever();
 
-		return $this->addProfilingDecorator( $PageRetriever, 'PageRetriever' );
+		return $this->addProfilingDecorator($PageRetriever, 'PageRetriever');
 	}
 
 	private function newCachedPageRetriever(): PageRetriever {
@@ -558,7 +558,7 @@ 
 	private function newNonCachedApiPageRetriever(): 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(),
 			$this->config['cms-wiki-title-prefix']
 		);
@@ -618,22 +618,22 @@ 
 			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)
 		);
 
-		$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() {
@@ -641,11 +641,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 {
@@ -653,14 +653,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;
 	}
 
@@ -674,7 +674,7 @@ 
 
 	private function newContactConfirmationMailer(): TemplateBasedMailer {
 		return $this->newTemplateMailer(
-			new TwigTemplate( $this->getTwig(), 'KontaktMailExtern.twig' ),
+			new TwigTemplate($this->getTwig(), 'KontaktMailExtern.twig'),
 			'mail_subject_getintouch'
 		);
 	}
@@ -692,12 +692,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 {
@@ -705,45 +705,45 @@ 
 	}
 
 	public function newCachePurger(): CachePurger {
-		return new AllOfTheCachePurger( $this->getTwig(), $this->getPageCache() );
+		return new AllOfTheCachePurger($this->getTwig(), $this->getPageCache());
 	}
 
 	private function newBankDataValidator(): BankDataValidator {
-		return new BankDataValidator( $this->newIbanValidator() );
+		return new BankDataValidator($this->newIbanValidator());
 	}
 
 	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;
 	}
 
@@ -751,25 +751,25 @@ 
 		return $this->pimple['twig_factory'];
 	}
 
-	private function newTextPolicyValidator( string $policyName ): TextPolicyValidator {
+	private function newTextPolicyValidator(string $policyName): TextPolicyValidator {
 		$contentProvider = $this->newWikiPageRetriever();
 		$textPolicyConfig = $this->config['text-policies'][$policyName];
 
 		return new TextPolicyValidator(
-			new PageRetrieverBasedStringList( $contentProvider, $textPolicyConfig['badwords'] ?? '' ),
-			new PageRetrieverBasedStringList( $contentProvider, $textPolicyConfig['whitewords'] ?? '' )
+			new PageRetrieverBasedStringList($contentProvider, $textPolicyConfig['badwords'] ?? ''),
+			new PageRetrieverBasedStringList($contentProvider, $textPolicyConfig['whitewords'] ?? '')
 		);
 	}
 
 	private function newCommentPolicyValidator(): TextPolicyValidator {
-		return $this->newTextPolicyValidator( 'comment' );
+		return $this->newTextPolicyValidator('comment');
 	}
 
-	public function newCancelDonationUseCase( string $updateToken ): CancelDonationUseCase {
+	public function newCancelDonationUseCase(string $updateToken): CancelDonationUseCase {
 		return new CancelDonationUseCase(
 			$this->getDonationRepository(),
 			$this->newCancelDonationMailer(),
-			$this->newDonationAuthorizer( $updateToken ),
+			$this->newDonationAuthorizer($updateToken),
 			$this->newDonationEventLogger()
 		);
 	}
@@ -779,7 +779,7 @@ 
 			new TwigTemplate(
 				$this->getTwig(),
 				'Mail_Donation_Cancellation_Confirmation.twig',
-				[ 'greeting_generator' => $this->getGreetingGenerator() ]
+				['greeting_generator' => $this->getGreetingGenerator()]
 			),
 			'mail_subject_confirm_cancellation'
 		);
@@ -837,19 +837,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 {
@@ -857,27 +857,27 @@ 
 	}
 
 	public function newPaymentDataValidator(): PaymentDataValidator {
-		return new PaymentDataValidator( $this->config['donation-minimum-amount'], $this->config['donation-maximum-amount'] );
+		return new PaymentDataValidator($this->config['donation-minimum-amount'], $this->config['donation-maximum-amount']);
 	}
 
 	private function newAmountFormatter(): AmountFormatter {
-		return new AmountFormatter( $this->config['locale'] );
+		return new AmountFormatter($this->config['locale']);
 	}
 
 	public function newDecimalNumberFormatter(): NumberFormatter {
-		return new NumberFormatter( $this->config['locale'], NumberFormatter::DECIMAL );
+		return new NumberFormatter($this->config['locale'], NumberFormatter::DECIMAL);
 	}
 
-	public function newAddCommentUseCase( string $updateToken ): AddCommentUseCase {
+	public function newAddCommentUseCase(string $updateToken): AddCommentUseCase {
 		return new AddCommentUseCase(
 			$this->getDonationRepository(),
-			$this->newDonationAuthorizer( $updateToken ),
+			$this->newDonationAuthorizer($updateToken),
 			$this->newCommentPolicyValidator(),
 			$this->newAddCommentValidator()
 		);
 	}
 
-	private function newDonationAuthorizer( string $updateToken = null, string $accessToken = null ): DonationAuthorizer {
+	private function newDonationAuthorizer(string $updateToken = null, string $accessToken = null): DonationAuthorizer {
 		return new DoctrineDonationAuthorizer(
 			$this->getEntityManager(),
 			$updateToken,
@@ -891,13 +891,13 @@ 
 
 	public function newDonationConfirmationPresenter() {
 		return new DonationConfirmationHtmlPresenter(
-			$this->getIncludeTemplate( 'DonationConfirmation.twig', [ 'piwikGoals' => [ 3 ] ] )
+			$this->getIncludeTemplate('DonationConfirmation.twig', ['piwikGoals' => [3]])
 		);
 	}
 
 	public function newCreditCardPaymentHtmlPresenter() {
 		return new CreditCardPaymentHtmlPresenter(
-			$this->getIncludeTemplate( 'CreditCardPaymentIframe.twig' ),
+			$this->getIncludeTemplate('CreditCardPaymentIframe.twig'),
 			$this->getTranslator(),
 			$this->newCreditCardUrlGenerator()
 		);
@@ -905,7 +905,7 @@ 
 
 	public function newCancelDonationHtmlPresenter() {
 		return new CancelDonationHtmlPresenter(
-			$this->getIncludeTemplate( 'Donation_Cancellation_Confirmation.twig' )
+			$this->getIncludeTemplate('Donation_Cancellation_Confirmation.twig')
 		);
 	}
 
@@ -925,7 +925,7 @@ 
 			new TwigTemplate(
 				$this->getTwig(),
 				'Mail_Membership_Application_Confirmation.twig',
-				[ 'greeting_generator' => $this->getGreetingGenerator() ]
+				['greeting_generator' => $this->getGreetingGenerator()]
 			),
 			'mail_subject_confirm_membership_application'
 		);
@@ -940,16 +940,16 @@ 
 	}
 
 	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());
 	}
 
-	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()
 		);
@@ -974,27 +974,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;
 	}
 
@@ -1005,21 +1005,21 @@ 
 	public function newDonationFormViolationPresenter() {
 		// TODO make the template name dependent on the 'form' value from the HTTP POST request
 		// (we need different form pages for A/B testing)
-		$template = $this->getLayoutTemplate( 'DisplayPageLayout.twig', [ 'main_template' => 'DonationForm.twig' ] );
-		return new DonationFormViolationPresenter( $template, $this->newAmountFormatter() );
+		$template = $this->getLayoutTemplate('DisplayPageLayout.twig', ['main_template' => 'DonationForm.twig']);
+		return new DonationFormViolationPresenter($template, $this->newAmountFormatter());
 	}
 
 	public function newDonationFormPresenter() {
 		// TODO make the template name dependent on the 'form' value from the HTTP POST request
 		// (we need different form pages for A/B testing)
-		$template = $this->getLayoutTemplate( 'DisplayPageLayout.twig', [ 'main_template' => 'DonationForm.twig' ] );
-		return new DonationFormPresenter( $template, $this->newAmountFormatter() );
+		$template = $this->getLayoutTemplate('DisplayPageLayout.twig', ['main_template' => 'DonationForm.twig']);
+		return new DonationFormPresenter($template, $this->newAmountFormatter());
 	}
 
-	public function newHandlePayPalPaymentNotificationUseCase( string $updateToken ) {
+	public function newHandlePayPalPaymentNotificationUseCase(string $updateToken) {
 		return new HandlePayPalPaymentNotificationUseCase(
 			$this->getDonationRepository(),
-			$this->newDonationAuthorizer( $updateToken ),
+			$this->newDonationAuthorizer($updateToken),
 			$this->newDonationConfirmationMailer(),
 			$this->getLogger(),
 			$this->newDonationEventLogger()
@@ -1030,14 +1030,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(),
@@ -1047,23 +1047,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;
 	}
 
@@ -1076,7 +1076,7 @@ 
 			new TwigTemplate(
 				$this->getTwig(),
 				'CreditCardPaymentNotification.twig',
-				[ 'returnUrl' => $this->config['creditcard']['return-url'] ]
+				['returnUrl' => $this->config['creditcard']['return-url']]
 			)
 		);
 	}
@@ -1097,7 +1097,7 @@ 
 		);
 	}
 
-	public function setTokenGenerator( TokenGenerator $tokenGenerator ) {
+	public function setTokenGenerator(TokenGenerator $tokenGenerator) {
 		$this->pimple['token_generator'] = $tokenGenerator;
 	}
 
@@ -1120,22 +1120,22 @@ 
 	private function newDonationPolicyValidator(): AddDonationPolicyValidator {
 		return new AddDonationPolicyValidator(
 			$this->newDonationAmountPolicyValidator(),
-			$this->newTextPolicyValidator( 'fields' )
+			$this->newTextPolicyValidator('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() {
@@ -1151,26 +1151,26 @@ 
 	}
 
 	public function enablePageCache() {
-		$this->pimple['page_cache'] = $this->pimple->share( function() {
-			return new FilesystemCache( $this->getCachePath() . '/pages' );
+		$this->pimple['page_cache'] = $this->pimple->share(function() {
+			return new FilesystemCache($this->getCachePath() . '/pages');
 		} );
 	}
 
-	private function addProfilingDecorator( $objectToDecorate, string $profilingLabel ) {
-		if ( $this->profiler === null ) {
+	private function addProfilingDecorator($objectToDecorate, string $profilingLabel) {
+		if ($this->profiler === null) {
 			return $objectToDecorate;
 		}
 
-		$builder = new ProfilingDecoratorBuilder( $this->profiler, $this->getProfilerDataCollector() );
+		$builder = new ProfilingDecoratorBuilder($this->profiler, $this->getProfilerDataCollector());
 
-		return $builder->decorate( $objectToDecorate, $profilingLabel );
+		return $builder->decorate($objectToDecorate, $profilingLabel);
 	}
 
-	public function setProfiler( Stopwatch $profiler ) {
+	public function setProfiler(Stopwatch $profiler) {
 		$this->profiler = $profiler;
 	}
 
-	public function setLogger( LoggerInterface $logger ) {
+	public function setLogger(LoggerInterface $logger) {
 		$this->pimple['logger'] = $logger;
 	}
 
@@ -1179,7 +1179,7 @@ 
 	}
 
 	private function newIbanValidator(): IbanValidator {
-		return new IbanValidator( $this->newBankDataConverter(), $this->config['banned-ibans'] );
+		return new IbanValidator($this->newBankDataConverter(), $this->config['banned-ibans']);
 	}
 
 	public function getCachePurgingSecret(): string {

app/routes.php

Spacing +203 added lines, -203 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;
@@ -41,141 +41,141 @@ 
 use WMDE\Fundraising\Frontend\SubscriptionContext\UseCases\AddSubscription\SubscriptionRequest;
 use WMDE\Fundraising\Frontend\Validation\MembershipFeeValidator;
 
-$app->before( function( Request $request ) {
-	foreach ( [ $request->request, $request->query ] as $parameterBag ) {
-		foreach ( $parameterBag->keys() as $key ) {
-			if ( is_string( $parameterBag->get( $key ) ) ) {
-				$parameterBag->set( $key, trim( $parameterBag->get( $key ) ) );
+$app->before(function(Request $request) {
+	foreach ([$request->request, $request->query] as $parameterBag) {
+		foreach ($parameterBag->keys() as $key) {
+			if (is_string($parameterBag->get($key))) {
+				$parameterBag->set($key, trim($parameterBag->get($key)));
 			}
 		}
 	}
-}, Application::EARLY_EVENT );
+}, Application::EARLY_EVENT);
 
 $app->post(
 	'validate-email',
-	function( Request $request ) use ( $app, $ffFactory ) {
-		$validationResult = $ffFactory->getEmailValidator()->validate( $request->request->get( 'email', '' ) );
-		return $app->json( [ 'status' => $validationResult->isSuccessful() ? 'OK' : 'ERR' ] );
+	function(Request $request) use ($app, $ffFactory) {
+		$validationResult = $ffFactory->getEmailValidator()->validate($request->request->get('email', ''));
+		return $app->json(['status' => $validationResult->isSuccessful() ? 'OK' : 'ERR']);
 	}
 );
 
 $app->post(
 	'validate-payment-data',
-	function( Request $request ) use ( $app, $ffFactory ) {
+	function(Request $request) use ($app, $ffFactory) {
 
-		$amount = (float) $ffFactory->newDecimalNumberFormatter()->parse( $request->get( 'amount', '0' ) );
+		$amount = (float)$ffFactory->newDecimalNumberFormatter()->parse($request->get('amount', '0'));
 		$validator = $ffFactory->newPaymentDataValidator();
-		$validationResult = $validator->validate( $amount, (string) $request->get( 'paymentType', '' ) );
+		$validationResult = $validator->validate($amount, (string)$request->get('paymentType', ''));
 
-		if ( $validationResult->isSuccessful() ) {
-			return $app->json( [ 'status' => 'OK' ] );
+		if ($validationResult->isSuccessful()) {
+			return $app->json(['status' => 'OK']);
 		} else {
 			$errors = [];
-			foreach( $validationResult->getViolations() as $violation ) {
-				$errors[ $violation->getSource() ] = $ffFactory->getTranslator()->trans( $violation->getMessageIdentifier() );
+			foreach ($validationResult->getViolations() as $violation) {
+				$errors[$violation->getSource()] = $ffFactory->getTranslator()->trans($violation->getMessageIdentifier());
 			}
-			return $app->json( [ 'status' => 'ERR', 'messages' => $errors ] );
+			return $app->json(['status' => 'ERR', 'messages' => $errors]);
 		}
 	}
 );
 
 $app->post(
 	'validate-address',
-	function( Request $request ) use ( $app, $ffFactory ) {
+	function(Request $request) use ($app, $ffFactory) {
 		$routeHandler = new class() {
 
-			public function handle( FunFunFactory $ffFactory, Application $app, Request $request ) {
-				if ( $request->get( 'adressType', '' ) === 'anonym' ) {
-					return $app->json( [ 'status' => 'OK' ] );
+			public function handle(FunFunFactory $ffFactory, Application $app, Request $request) {
+				if ($request->get('adressType', '') === 'anonym') {
+					return $app->json(['status' => 'OK']);
 				}
 
-				$personalInfo = $this->getPersonalInfoFromRequest( $request );
+				$personalInfo = $this->getPersonalInfoFromRequest($request);
 				$personalInfoValidator = $ffFactory->newPersonalInfoValidator();
-				$validationResult = $personalInfoValidator->validate( $personalInfo );
+				$validationResult = $personalInfoValidator->validate($personalInfo);
 
-				if ( $validationResult->isSuccessful() ) {
-					return $app->json( [ 'status' => 'OK' ] );
+				if ($validationResult->isSuccessful()) {
+					return $app->json(['status' => 'OK']);
 				} else {
 					$errors = [];
-					foreach( $validationResult->getViolations() as $violation ) {
-						$errors[$violation->getSource()] = $ffFactory->getTranslator()->trans( $violation->getMessageIdentifier() );
+					foreach ($validationResult->getViolations() as $violation) {
+						$errors[$violation->getSource()] = $ffFactory->getTranslator()->trans($violation->getMessageIdentifier());
 					}
-					return $app->json( [ 'status' => 'ERR', 'messages' => $errors ] );
+					return $app->json(['status' => 'ERR', 'messages' => $errors]);
 				}
 			}
 
-			private function getPersonalInfoFromRequest( Request $request ): Donor {
+			private function getPersonalInfoFromRequest(Request $request): Donor {
 				return new Donor(
-					$this->getNameFromRequest( $request ),
-					$this->getPhysicalAddressFromRequest( $request ),
-					$request->get( 'email', '' )
+					$this->getNameFromRequest($request),
+					$this->getPhysicalAddressFromRequest($request),
+					$request->get('email', '')
 				);
 			}
 
-			private function getPhysicalAddressFromRequest( Request $request ): DonorAddress {
+			private function getPhysicalAddressFromRequest(Request $request): DonorAddress {
 				$address = new DonorAddress();
 
-				$address->setStreetAddress( $request->get( 'street', '' ) );
-				$address->setPostalCode( $request->get( 'postcode', '' ) );
-				$address->setCity( $request->get( 'city', '' ) );
-				$address->setCountryCode( $request->get( 'country', '' ) );
+				$address->setStreetAddress($request->get('street', ''));
+				$address->setPostalCode($request->get('postcode', ''));
+				$address->setCity($request->get('city', ''));
+				$address->setCountryCode($request->get('country', ''));
 
 				return $address->freeze()->assertNoNullFields();
 			}
 
-			private function getNameFromRequest( Request $request ): DonorName {
-				$name = $request->get( 'addressType', '' ) === 'firma'
+			private function getNameFromRequest(Request $request): DonorName {
+				$name = $request->get('addressType', '') === 'firma'
 					? DonorName::newCompanyName() : DonorName::newPrivatePersonName();
 
-				$name->setSalutation( $request->get( 'salutation', '' ) );
-				$name->setTitle( $request->get( 'title', '' ) );
-				$name->setCompanyName( $request->get( 'companyName', '' ) );
-				$name->setFirstName( $request->get( 'firstName', '' ) );
-				$name->setLastName( $request->get( 'lastName', '' ) );
+				$name->setSalutation($request->get('salutation', ''));
+				$name->setTitle($request->get('title', ''));
+				$name->setCompanyName($request->get('companyName', ''));
+				$name->setFirstName($request->get('firstName', ''));
+				$name->setLastName($request->get('lastName', ''));
 
 				return $name->freeze()->assertNoNullFields();
 			}
 		};
 
-		return $routeHandler->handle( $ffFactory, $app, $request );
+		return $routeHandler->handle($ffFactory, $app, $request);
 	}
 );
 
 $app->post(
 	'validate-fee',
-	function( Request $httpRequest ) use ( $app, $ffFactory ) {
+	function(Request $httpRequest) use ($app, $ffFactory) {
 		$validator = new MembershipFeeValidator();
 		$result = $validator->validate(
-			str_replace( ',', '.', $httpRequest->request->get( 'amount', '' ) ),
-			(int) $httpRequest->request->get( 'paymentIntervalInMonths', '0' ),
-			$httpRequest->request->get( 'addressType', '' )
+			str_replace(',', '.', $httpRequest->request->get('amount', '')),
+			(int)$httpRequest->request->get('paymentIntervalInMonths', '0'),
+			$httpRequest->request->get('addressType', '')
 		);
 
-		if ( $result->isSuccessful() ) {
-			return $app->json( [ 'status' => 'OK' ] );
+		if ($result->isSuccessful()) {
+			return $app->json(['status' => 'OK']);
 		} else {
 			$errors = $result->getViolations();
-			return $app->json( [ 'status' => 'ERR', 'message' => implode( "\n", $errors ) ] );
+			return $app->json(['status' => 'ERR', 'message' => implode("\n", $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;
@@ -184,10 +184,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)
 			)
 		);
 
@@ -204,16 +204,16 @@ 
 
 $app->get(
 	'list-comments.html',
-	function( Request $request ) use ( $app, $ffFactory ) {
+	function(Request $request) use ($app, $ffFactory) {
 		return new Response(
 			$ffFactory->newCommentListHtmlPresenter()->present(
 				$ffFactory->newListCommentsUseCase()->listComments(
 					new CommentListingRequest(
 						10,
-						(int)$request->query->get( 'page', '1' )
+						(int)$request->query->get('page', '1')
 					)
 				),
-				(int)$request->query->get( 'page', '1' )
+				(int)$request->query->get('page', '1')
 			)
 		);
 	}
@@ -221,150 +221,150 @@ 
 
 $app->get(
 	'page/{pageName}',
-	function( Application $app, $pageName ) use ( $ffFactory ) {
-		$templateExists = $ffFactory->getTemplateNameValidator()->validate( $pageName )->isSuccessful();
+	function(Application $app, $pageName) use ($ffFactory) {
+		$templateExists = $ffFactory->getTemplateNameValidator()->validate($pageName)->isSuccessful();
 
-		return $ffFactory->getLayoutTemplate( 'DisplayPageLayout.twig' )->render( [
+		return $ffFactory->getLayoutTemplate('DisplayPageLayout.twig')->render([
 			'main_template' => $templateExists ? $pageName : '404message.html.twig',
-		] );
+		]);
 	}
 )
-->bind( 'page' );
+->bind('page');
 
 // Form for this is provided by route page/Subscription_Form
 $app->post(
 	'contact/subscribe',
-	function( Application $app, Request $request ) use ( $ffFactory ) {
+	function(Application $app, Request $request) use ($ffFactory) {
 		$useCase = $ffFactory->newAddSubscriptionUseCase();
 
 		$subscriptionRequest = new SubscriptionRequest();
-		$subscriptionRequest->setAddress( $request->get( 'address', '' ) );
-		$subscriptionRequest->setCity( $request->get( 'city', '' ) );
-		$subscriptionRequest->setPostcode( $request->get( 'postcode', '' ) );
+		$subscriptionRequest->setAddress($request->get('address', ''));
+		$subscriptionRequest->setCity($request->get('city', ''));
+		$subscriptionRequest->setPostcode($request->get('postcode', ''));
 
-		$subscriptionRequest->setFirstName( $request->get( 'firstName', '' ) );
-		$subscriptionRequest->setLastName( $request->get( 'lastName', '' ) );
-		$subscriptionRequest->setSalutation( $request->get( 'salutation', '' ) );
-		$subscriptionRequest->setTitle( $request->get( 'title', '' ) );
+		$subscriptionRequest->setFirstName($request->get('firstName', ''));
+		$subscriptionRequest->setLastName($request->get('lastName', ''));
+		$subscriptionRequest->setSalutation($request->get('salutation', ''));
+		$subscriptionRequest->setTitle($request->get('title', ''));
 
-		$subscriptionRequest->setEmail( $request->get( 'email', '' ) );
+		$subscriptionRequest->setEmail($request->get('email', ''));
 
-		$subscriptionRequest->setWikiloginFromValues( [
-			$request->request->get( 'wikilogin' ),
-			$request->cookies->get( 'spenden_wikilogin' ),
-		] );
+		$subscriptionRequest->setWikiloginFromValues([
+			$request->request->get('wikilogin'),
+			$request->cookies->get('spenden_wikilogin'),
+		]);
 
-		$responseModel = $useCase->addSubscription( $subscriptionRequest );
-		if ( $app['request.is_json'] ) {
-			return $app->json( $ffFactory->newAddSubscriptionJSONPresenter()->present( $responseModel ) );
+		$responseModel = $useCase->addSubscription($subscriptionRequest);
+		if ($app['request.is_json']) {
+			return $app->json($ffFactory->newAddSubscriptionJSONPresenter()->present($responseModel));
 		}
-		if ( $responseModel->isSuccessful() ) {
-			if ( $responseModel->needsModeration() ) {
-				return $app->redirect( $app['url_generator']->generate('page', [ 'pageName' => 'Subscription_Moderation' ] ) );
+		if ($responseModel->isSuccessful()) {
+			if ($responseModel->needsModeration()) {
+				return $app->redirect($app['url_generator']->generate('page', ['pageName' => 'Subscription_Moderation']));
 			}
-			return $app->redirect( $app['url_generator']->generate('page', [ 'pageName' => 'Subscription_Success' ] ) );
+			return $app->redirect($app['url_generator']->generate('page', ['pageName' => 'Subscription_Success']));
 		}
-		return $ffFactory->newAddSubscriptionHTMLPresenter()->present( $responseModel, $request->request->all() );
+		return $ffFactory->newAddSubscriptionHTMLPresenter()->present($responseModel, $request->request->all());
 	}
 )
-->bind( 'subscribe' );
+->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]+$' );
+->assert('confirmationCode', '^[0-9a-f]+$');
 
 $app->get(
 	'check-iban',
-	function( Request $request ) use ( $app, $ffFactory ) {
+	function(Request $request) use ($app, $ffFactory) {
 		$useCase = $ffFactory->newCheckIbanUseCase();
-		$checkIbanResponse = $useCase->checkIban( new Iban( $request->query->get( 'iban', '' ) ) );
-		return $app->json( $ffFactory->newIbanPresenter()->present( $checkIbanResponse ) );
+		$checkIbanResponse = $useCase->checkIban(new Iban($request->query->get('iban', '')));
+		return $app->json($ffFactory->newIbanPresenter()->present($checkIbanResponse));
 	}
 );
 
 $app->get(
 	'generate-iban',
-	function( Request $request ) use ( $app, $ffFactory ) {
+	function(Request $request) use ($app, $ffFactory) {
 		$generateIbanRequest = new GenerateIbanRequest(
-			$request->query->get( 'accountNumber', '' ),
-			$request->query->get( 'bankCode', '' )
+			$request->query->get('accountNumber', ''),
+			$request->query->get('bankCode', '')
 		);
 
-		$generateIbanResponse = $ffFactory->newGenerateIbanUseCase()->generateIban( $generateIbanRequest );
-		return $app->json( $ffFactory->newIbanPresenter()->present( $generateIbanResponse ) );
+		$generateIbanResponse = $ffFactory->newGenerateIbanUseCase()->generateIban($generateIbanRequest);
+		return $app->json($ffFactory->newIbanPresenter()->present($generateIbanResponse));
 	}
 );
 
 $app->post(
 	'add-comment',
-	function( Request $request ) use ( $app, $ffFactory ) {
+	function(Request $request) use ($app, $ffFactory) {
 		$addCommentRequest = new AddCommentRequest();
-		$addCommentRequest->setCommentText( trim( $request->request->get( 'kommentar', '' ) ) );
-		$addCommentRequest->setIsPublic( $request->request->get( 'public', '0' ) === '1' );
-		$addCommentRequest->setAuthorDisplayName( trim( $request->request->get( 'eintrag', '' ) ) );
-		$addCommentRequest->setDonationId( (int)$request->request->get( 'sid', '' ) );
+		$addCommentRequest->setCommentText(trim($request->request->get('kommentar', '')));
+		$addCommentRequest->setIsPublic($request->request->get('public', '0') === '1');
+		$addCommentRequest->setAuthorDisplayName(trim($request->request->get('eintrag', '')));
+		$addCommentRequest->setDonationId((int)$request->request->get('sid', ''));
 		$addCommentRequest->freeze()->assertNoNullFields();
 
-		$updateToken = $request->request->get( 'utoken', '' );
+		$updateToken = $request->request->get('utoken', '');
 
-		if ( $updateToken === '' ) {
-			return $app->json( [
+		if ($updateToken === '') {
+			return $app->json([
 				'status' => 'ERR',
-				'message' => $ffFactory->getTranslator()->trans( 'comment_failure_access_denied' ),
-			] );
+				'message' => $ffFactory->getTranslator()->trans('comment_failure_access_denied'),
+			]);
 		}
 
-		$response = $ffFactory->newAddCommentUseCase( $updateToken )->addComment( $addCommentRequest );
+		$response = $ffFactory->newAddCommentUseCase($updateToken)->addComment($addCommentRequest);
 
-		if ( $response->isSuccessful() ) {
-			return $app->json( [
+		if ($response->isSuccessful()) {
+			return $app->json([
 				'status' => 'OK',
-				'message' => $ffFactory->getTranslator()->trans( $response->getSuccessMessage() ),
-			] );
+				'message' => $ffFactory->getTranslator()->trans($response->getSuccessMessage()),
+			]);
 		}
 
-		return $app->json( [
+		return $app->json([
 			'status' => 'ERR',
-			'message' => $ffFactory->getTranslator()->trans( $response->getErrorMessage() ),
-		] );
+			'message' => $ffFactory->getTranslator()->trans($response->getErrorMessage()),
+		]);
 	}
 );
 
 $app->post(
 	'contact/get-in-touch',
-	function( Request $request ) use ( $app, $ffFactory ) {
+	function(Request $request) use ($app, $ffFactory) {
 		$contactFormRequest = new GetInTouchRequest(
-			$request->get( 'firstname', '' ),
-			$request->get( 'lastname', '' ),
-			$request->get( 'email', '' ),
-			$request->get( 'subject', '' ),
-			$request->get( 'messageBody', '' )
+			$request->get('firstname', ''),
+			$request->get('lastname', ''),
+			$request->get('email', ''),
+			$request->get('subject', ''),
+			$request->get('messageBody', '')
 		);
 
-		$contactFormResponse = $ffFactory->newGetInTouchUseCase()->processContactRequest( $contactFormRequest );
-		if ( $contactFormResponse->isSuccessful() ) {
-			return $app->redirect( $app['url_generator']->generate( 'page', [ 'pageName' => 'KontaktBestaetigung' ] ) );
+		$contactFormResponse = $ffFactory->newGetInTouchUseCase()->processContactRequest($contactFormRequest);
+		if ($contactFormResponse->isSuccessful()) {
+			return $app->redirect($app['url_generator']->generate('page', ['pageName' => 'KontaktBestaetigung']));
 		}
-		return $ffFactory->newGetInTouchHTMLPresenter()->present( $contactFormResponse, $request->request->all() );
+		return $ffFactory->newGetInTouchHTMLPresenter()->present($contactFormResponse, $request->request->all());
 	}
 );
 
 $app->post(
 	'donation/cancel',
-	function( Request $request ) use ( $app, $ffFactory ) {
+	function(Request $request) use ($app, $ffFactory) {
 		$cancellationRequest = new CancelDonationRequest(
-			(int)$request->request->get( 'sid', '' )
+			(int)$request->request->get('sid', '')
 		);
 
-		$responseModel = $ffFactory->newCancelDonationUseCase( $request->request->get( 'utoken', '' ) )
-			->cancelDonation( $cancellationRequest );
+		$responseModel = $ffFactory->newCancelDonationUseCase($request->request->get('utoken', ''))
+			->cancelDonation($cancellationRequest);
 
-		$httpResponse = new Response( $ffFactory->newCancelDonationHtmlPresenter()->present( $responseModel ) );
-		if ( $responseModel->cancellationSucceeded() ) {
-			$httpResponse->headers->clearCookie( 'donation_timestamp' );
+		$httpResponse = new Response($ffFactory->newCancelDonationHtmlPresenter()->present($responseModel));
+		if ($responseModel->cancellationSucceeded()) {
+			$httpResponse->headers->clearCookie('donation_timestamp');
 		}
 
 		return $httpResponse;
@@ -374,112 +374,112 @@ 
 
 $app->post(
 	'donation/add',
-	function( Application $app, Request $request ) use ( $ffFactory ) {
-		return ( new AddDonationHandler( $ffFactory, $app ) )
-			->handle( $request, $app['session']->get( 'piwikTracking', [] ) );
+	function(Application $app, Request $request) use ($ffFactory) {
+		return (new AddDonationHandler($ffFactory, $app))
+			->handle($request, $app['session']->get('piwikTracking', []));
 	}
 );
 
 // Show a donation form with pre-filled payment values, e.g. when coming from a banner
-$app->get( 'donation/new', function ( Application $app, Request $request ) use ( $ffFactory ) {
-	$amount = Euro::newFromFloat( ( new AmountParser( 'de_DE' ) )->parseAsFloat( $request->get( 'betrag', '' ) ) );
+$app->get('donation/new', function(Application $app, Request $request) use ($ffFactory) {
+	$amount = Euro::newFromFloat((new AmountParser('de_DE'))->parseAsFloat($request->get('betrag', '')));
 
-	return new Response( $ffFactory->newDonationFormPresenter()->present(
+	return new Response($ffFactory->newDonationFormPresenter()->present(
 		$amount,
-		$request->get( 'zahlweise', '' ),
-		intval( $request->get( 'periode', 0 ) )
-	) );
+		$request->get('zahlweise', ''),
+		intval($request->get('periode', 0))
+	));
 } );
 
 $app->post(
 	'apply-for-membership',
-	function( Application $app, Request $httpRequest ) use ( $ffFactory ) {
-		return ( new ApplyForMembershipHandler( $ffFactory, $app ) )->handle( $httpRequest );
+	function(Application $app, Request $httpRequest) use ($ffFactory) {
+		return (new ApplyForMembershipHandler($ffFactory, $app))->handle($httpRequest);
 	}
 );
 
 $app->get(
 	'show-membership-confirmation',
-	function( Application $app, Request $request ) use ( $ffFactory ) {
-		$confirmationRequest = new ShowMembershipAppConfirmationRequest( (int)$request->query->get( 'id', 0 ) );
+	function(Application $app, Request $request) use ($ffFactory) {
+		$confirmationRequest = new ShowMembershipAppConfirmationRequest((int)$request->query->get('id', 0));
 
 		return $ffFactory->newMembershipApplicationConfirmationHtmlPresenter()->present(
-			$ffFactory->newMembershipApplicationConfirmationUseCase( $request->query->get( 'token', '' ) )
-				->showConfirmation( $confirmationRequest )
+			$ffFactory->newMembershipApplicationConfirmationUseCase($request->query->get('token', ''))
+				->showConfirmation($confirmationRequest)
 		);
 	}
-)->bind( 'show-membership-confirmation' );
+)->bind('show-membership-confirmation');
 
 $app->get(
 	'cancel-membership-application',
-	function( Application $app, Request $request ) use ( $ffFactory ) {
+	function(Application $app, 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 ( Application $app, Request $request ) use ( $ffFactory ) {
-		return ( new PayPalNotificationHandler( $ffFactory ) )->handle( $request );
+	function(Application $app, Request $request) use ($ffFactory) {
+		return (new PayPalNotificationHandler($ffFactory))->handle($request);
 	}
 );
 
 $app->get(
 	'handle-creditcard-payment-notification',
-	function ( Application $app, Request $request ) use ( $ffFactory ) {
+	function(Application $app, 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( '/', 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;
 			} )
 	);
 
@@ -497,25 +497,25 @@ 
 } );
 
 // redirect display page requests from old URLs
-$app->get( '/spenden/{page}', function( Application $app, Request $request, string $page ) {
-	return ( new RouteRedirectionHandler( $app, $request->getQueryString() ) )->handle( '/page/' . $page );
-} )->assert( 'page', '[a-zA-Z_\-\s\x7f-\xff]+' );
+$app->get('/spenden/{page}', function(Application $app, Request $request, string $page) {
+	return (new RouteRedirectionHandler($app, $request->getQueryString()))->handle('/page/' . $page);
+} )->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( Application $app, Request $request ) use ( $ffFactory ) {
-	if ( $request->query->get( 'secret', '' ) !== $ffFactory->getCachePurgingSecret() ) {
-		return new Response( 'ACCESS DENIED' );
+$app->get('/purge-cache', function(Application $app, Request $request) use ($ffFactory) {
+	if ($request->query->get('secret', '') !== $ffFactory->getCachePurgingSecret()) {
+		return new Response('ACCESS DENIED');
 	}
 
 	$purger = $ffFactory->newCachePurger();
@@ -523,11 +523,11 @@ 
 	try {
 		$purger->purgeCache();
 	}
-	catch ( CachePurgingException $ex ) {
-		return new Response( 'ERROR' );
+	catch (CachePurgingException $ex) {
+		return new Response('ERROR');
 	}
 
-	return new Response( 'SUCCESS' );
+	return new Response('SUCCESS');
 } );
 
 return $app;

Braces +1 added lines, -2 removed lines

@@ -522,8 +522,7 @@
 
 	try {
 		$purger->purgeCache();
-	}
-	catch ( CachePurgingException $ex ) {
+	} catch ( CachePurgingException $ex ) {
 		return new Response( 'ERROR' );
 	}