DON-998 - fix psalm:

* remove 'missing salesforceId' exeptions, it will never be null
thebiggive · Jan 3, 2025 · 913327a · 913327a
1 parent 805e582
commit 913327a
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 15 deletions.
diff --git a/integrationTests/PullCharityUpdatedBasedOnSfHookTest.php b/integrationTests/PullCharityUpdatedBasedOnSfHookTest.php
@@ -29,7 +29,6 @@ public function testItPullsCharityUpdateAfterSalesforceSendsHook(): void
         $campaign = TestCase::someCampaign();
         $charity = $campaign->getCharity();
         $sfId = $charity->getSalesforceId();
-        \assert(is_string($sfId));
 
         $em->persist($campaign);
         $em->persist($charity);

diff --git a/src/Application/Commands/SetupTestMandate.php b/src/Application/Commands/SetupTestMandate.php
@@ -109,9 +109,7 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
             $donorId,
             Money::fromPoundsGBP($amount),
             Salesforce18Id::ofCampaign($campaign->getSalesforceId()),
-            Salesforce18Id::ofCharity(
-                $charity->getSalesforceId() ?? throw new \Exception('Missing charity sf ID')
-            ),
+            Salesforce18Id::ofCharity($charity->getSalesforceId()),
             (bool)$input->getOption('gift-aid'),
             $dayOfMonth
         );

diff --git a/src/Domain/DonationService.php b/src/Domain/DonationService.php
@@ -353,7 +353,7 @@ function () use ($donation) {
                 if ($stripeAccountId === null || $stripeAccountId === '') {
                     $this->logger->error(sprintf(
                         'Stripe Payment Intent create error: Stripe Account ID not set for Account %s',
-                        $campaign->getCharity()->getSalesforceId() ?? 'missing charity sf ID',
+                        $campaign->getCharity()->getSalesforceId(),
                     ));
                     throw new StripeAccountIdNotSetForAccount();
                 }

diff --git a/src/Domain/RegularGivingMandateRepository.php b/src/Domain/RegularGivingMandateRepository.php
@@ -94,10 +94,7 @@ private function getMandatesWithCharities(\Doctrine\ORM\Query $query)
         $charities = [];
         foreach ($x as $entity) {
             if ($entity instanceof Charity) {
-                $salesforceId = $entity->getSalesforceId();
-                \assert($salesforceId !== null);
-
-                $charities[$salesforceId] = $entity;
+                $charities[$entity->getSalesforceId()] = $entity;
             }
         }
 

diff --git a/src/Domain/RegularGivingService.php b/src/Domain/RegularGivingService.php
@@ -51,9 +51,7 @@ public function setupNewMandate(
             );
         }
 
-        $charityId = Salesforce18Id::ofCharity(
-            $campaign->getCharity()->getSalesforceId() ?? throw new \Exception('missing charity SF ID')
-        );
+        $charityId = Salesforce18Id::ofCharity($campaign->getCharity()->getSalesforceId());
 
         /**
          * For now we assume this exists - @todo-regular-giving ensure that for all accounts (or all accounts that

diff --git a/tests/Domain/RegularGivingMandateTest.php b/tests/Domain/RegularGivingMandateTest.php
@@ -157,9 +157,7 @@ public function testItRendersApiModel(): void
             donationAmount: Money::fromPoundsGBP(500),
             dayOfMonth: DayOfMonth::of(12),
             campaignId: Salesforce18Id::ofCampaign('campaign9012345678'),
-            charityId: Salesforce18Id::ofCharity(
-                $charity->getSalesforceId() ?? throw new \Exception("sf id can't be null")
-            ),
+            charityId: Salesforce18Id::ofCharity($charity->getSalesforceId()),
             giftAid: true,
         );