Merge branch 'release/2.1.1'

getgrav · Apr 14, 2021 · b4a1170 · b4a1170
2 parents cb50b02 + 9a127b4
commit b4a1170
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v2.1.1
+## 04/14/2021
+
+1. [](#bugfix)
+    * Fixed a check for loading problem classes [#32](https://github.com/getgrav/grav-plugin-problems/issues/32)
+    * Regression: folders check fails in Windows [#31](https://github.com/getgrav/grav-plugin-problems/issues/31)
+
 # v2.1.0
 ## 04/13/2021
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,7 +1,7 @@
 name: Problems
 slug: problems
 type: plugin
-version: 2.1.0
+version: 2.1.1
 description: Detects and reports problems found in the site.
 icon: exclamation-circle
 author:

diff --git a/classes/Problems/Base/ProblemChecker.php b/classes/Problems/Base/ProblemChecker.php
@@ -84,14 +84,17 @@ public function check($problems_dir = null): bool
         $problems = [];
         $problems_found = false;
 
-        foreach (new \DirectoryIterator($problems_dir) as $file) {
-            if ($file->isDot() || $file->isDir()) {
+        $iterator = new \DirectoryIterator($problems_dir);
+        foreach ($iterator as $file) {
+            if (!$file->isFile() || $file->getExtension() !== 'php') {
                 continue;
             }
             $classname = 'Grav\\Plugin\\Problems\\' . $file->getBasename('.php');
-            /** @var Problem $problem */
-            $problem = new $classname();
-            $problems[$problem->getId()] = $problem;
+            if (class_exists($classname)) {
+                /** @var Problem $problem */
+                $problem = new $classname();
+                $problems[$problem->getId()] = $problem;
+            }
         }
 
         // Fire event to allow other plugins to add problems

diff --git a/classes/Problems/EssentialFolders.php b/classes/Problems/EssentialFolders.php
@@ -50,7 +50,7 @@ public function process()
         $file_success = [];
 
         foreach ($essential_folders as $file => $check_writable) {
-            $file_path = (!str_starts_with($file, '/') ? GRAV_ROOT . '/' : '') . $file;
+            $file_path = (!preg_match('`^(/|[a-z]:[\\\/])`ui', $file) ? GRAV_ROOT . '/' : '') . $file;
 
             if (!is_dir($file_path)) {
                 $file_errors[$file_path] = 'does not exist';