feat: add method getVersionFromFile to get version

efureev · Apr 28, 2022 · 0c6cf91 · 0c6cf91
1 parent 11c66b1
commit 0c6cf91
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/ServiceProviders/HasPathHelpers.php b/src/ServiceProviders/HasPathHelpers.php
@@ -127,14 +127,14 @@ public static function getViewsPath(): ?string
     public static function version(): string
     {
         return (string)(
-            static::getVersionFromFile('version.json') ??
-            static::getVersionFromFile('composer.json')
+            static::getVersionFromFile(static::packagePath('version.json')) ??
+            static::getVersionFromFile(static::packagePath('composer.json'))
         );
     }
 
-    protected static function getVersionFromFile(string $filePath, string $key = 'version'): ?string
+    protected static function getVersionFromFile(?string $filePath, string $key = 'version'): ?string
     {
-        if (!file_exists($filePath)) {
+        if (!$filePath || !file_exists($filePath)) {
             return null;
         }