Merge pull request #1205: Support Psalm v6, add PHP 8.4 in CI

spiral · Jan 31, 2025 · 1c955de · 1c955de
1 parent 7b95470
commit 1c955de
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -40,9 +40,9 @@
     },
     "require-dev": {
         "spiral/boot": "^3.16",
-        "phpunit/phpunit": "^10.5",
-        "mockery/mockery": "^1.6",
-        "vimeo/psalm": "^5.9"
+        "phpunit/phpunit": "^10.5.41",
+        "mockery/mockery": "^1.6.12",
+        "vimeo/psalm": "^6.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Engine/Native/NativeView.php b/src/Engine/Native/NativeView.php
@@ -41,6 +41,7 @@ public function render(array $data = []): string
             }
         }
 
-        return \ob_get_clean();
+        $result = \ob_get_clean();
+        return $result === false ? '' : $result;
     }
 }
diff --git a/src/ViewSource.php b/src/ViewSource.php
@@ -46,7 +46,11 @@ public function getFilename(): string
      */
     public function getCode(): string
     {
-        return $this->code ?? \file_get_contents($this->getFilename());
+        $result = $this->code ?? \file_get_contents($this->getFilename());
+        $result === false and throw new \RuntimeException(
+            \sprintf('Unable to read file `%s`.', $this->getFilename()),
+        );
+        return $result;
     }
 
     /**