Prevent null|string function calls

OpenConext · Jul 11, 2024 · a1c3daa · a1c3daa
1 parent 50d25d2
commit a1c3daa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/Surfnet/StepupGateway/GatewayBundle/Saml/ResponseContext.php b/src/Surfnet/StepupGateway/GatewayBundle/Saml/ResponseContext.php
@@ -232,9 +232,11 @@ public function getIdentityNameId(): string
      */
     public function getNormalizedSchacHomeOrganization(): ?string
     {
-        return strtolower(
-            $this->stateHandler->getSchacHomeOrganization()
-        );
+        $schacHomeOrganization = $this->stateHandler->getSchacHomeOrganization();
+        if ($schacHomeOrganization === null) {
+            return null;
+        }
+        return strtolower($schacHomeOrganization);
     }
 
     /**

diff --git a/tests/features/bootstrap/FeatureContext.php b/tests/features/bootstrap/FeatureContext.php
@@ -162,6 +162,9 @@ public function iEnterTheOtp(): void
     public function iEnterTheSmsVerificationCode(): void
     {
         $cookieValue = $this->minkContext->getSession()->getDriver()->getCookie('smoketest-sms-service');
+        if ($cookieValue === null) {
+            throw new RuntimeException('Unable to load the smoketest-sms-service cookie');
+        }
         $matches = [];
         preg_match('/^Your\ SMS\ code:\ (.*)$/', $cookieValue, $matches);
         $this->minkContext->fillField('gateway_verify_sms_challenge_challenge', $matches[1]);