add isPath method, fix validation errors, fix returned data types

README.md

@@ -210,6 +210,18 @@ var_dump (
 );
 ```
 
+#### Filesystem::isPath
+
+Check path exist and match storage item
+
+```
+var_dump (
+    $filesystem->isPath(
+        '/full/path/to/page.txt'
+    )
+);
+```
+
 ### Helper
 
 Useful methods to minify controller codebase

src/Dokuwiki/Filesystem.php

@@ -58,7 +58,7 @@ class Filesystem
             )
         );
 
-        if (!in_array($path, $this->_list) || !is_file($path) || !is_readable($path))
+        if (!$this->isPath($path))
         {
             return null;
         }
@@ -68,7 +68,7 @@ class Filesystem
 
     public function getPageUriByPath(string $path): ?string
     {
-        if (!in_array($path, $this->_list) || !is_file($path) || !is_readable($path))
+        if (!$this->isPath($path))
         {
             return null;
         }
@@ -179,7 +179,7 @@ class Filesystem
             )
         );
 
-        if (!in_array($path, $this->_list) || !is_file($path) || !is_readable($path))
+        if (!$this->isPath($path))
         {
             return null;
         }
@@ -189,11 +189,12 @@ class Filesystem
 
     public function getMimeByPath(?string $path): ?string
     {
-        if (in_array($path, $this->_list) && is_file($path) || is_readable($path))
+        if ($this->isPath($path))
         {
-            return mime_content_type(
+            if ($mime = mime_content_type($path))
-                $path
+            {
-            );
+                return $mime;
+            }
         }
 
         return null;
@@ -201,16 +202,27 @@ class Filesystem
 
     public function getDataByPath(?string $path): ?string
     {
-        if (in_array($path, $this->_list) && is_file($path) || is_readable($path))
+        if ($this->isPath($path))
         {
-            return file_get_contents(
+            if ($data = file_get_contents($path))
-                $path
+            {
-            );
+                return $data;
+            }
         }
 
         return null;
     }
 
+    public function isPath(?string $path): bool
+    {
+        if (in_array($path, $this->_list) && is_file($path) && is_readable($path))
+        {
+            return true;
+        }
+
+        return false;
+    }
+
     private function _index(string $path, ?array $blacklist = ['.', '..', 'sidebar.txt', '__template.txt']): void
     {
         foreach ((array) scandir($path) as $file)