Merge pull request #358 from Roave/renovate/all-minor-patch

Update dependency vimeo/psalm to ^5.20.0
Roave · Jan 18, 2024 · 2fe576b · 2fe576b
2 parents a9a2118 + cf44f5f
commit 2fe576b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
         "phpunit/phpunit": "^10.5.7",
         "psalm/plugin-phpunit": "^0.18.4",
         "roave/security-advisories": "dev-latest",
-        "vimeo/psalm": "^5.19.1"
+        "vimeo/psalm": "^5.20.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/DocbookPage.php b/src/DocbookPage.php
@@ -73,7 +73,7 @@ private function determineTitleFromContent(): string
     {
         $firstLine = strtok($this->content, "\n");
 
-        if (! $firstLine || ! str_starts_with($firstLine, '<h1>') || ! str_ends_with($firstLine, '</h1>')) {
+        if ($firstLine === false || ! str_starts_with($firstLine, '<h1>') || ! str_ends_with($firstLine, '</h1>')) {
             throw new RuntimeException('First line of markdown file ' . $this->slug() . ' did not start with "# "...');
         }
 

diff --git a/src/Environment.php b/src/Environment.php
@@ -25,9 +25,14 @@ public static function require(string $name): string
         return $value;
     }
 
+    /** @return non-empty-string|null */
     public static function optional(string $name): string|null
     {
-        return getenv($name) ?: null;
+        $value = getenv($name);
+
+        return $value === false || $value === ''
+            ? null
+            : $value;
     }
 
     /** @param list<string> $trueValues */