Merge pull request #8740 from kenjis/fix-ClearDebugbar

kenjis · web-flow · commit 0d1c6b921b33 · 2024-04-10T08:57:55.000+09:00
fix: update `debugbar:clear` code because of file changes
diff --git a/system/Commands/Housekeeping/ClearDebugbar.php b/system/Commands/Housekeeping/ClearDebugbar.php
@@ -57,7 +57,7 @@ public function run(array $params)
     {
         helper('filesystem');
 
-        if (! delete_files(WRITEPATH . 'debugbar')) {
+        if (! delete_files(WRITEPATH . 'debugbar', false, true)) {
             // @codeCoverageIgnoreStart
             CLI::error('Error deleting the debugbar JSON files.');
             CLI::newLine();
diff --git a/tests/system/Commands/ClearDebugbarTest.php b/tests/system/Commands/ClearDebugbarTest.php
@@ -61,7 +61,7 @@ public function testClearDebugbarWorks(): void
         $result = $this->getStreamFilterBuffer();
 
         $this->assertFileDoesNotExist(WRITEPATH . 'debugbar' . DIRECTORY_SEPARATOR . "debugbar_{$this->time}.json");
-        $this->assertFileExists(WRITEPATH . 'debugbar' . DIRECTORY_SEPARATOR . '.gitkeep');
+        $this->assertFileExists(WRITEPATH . 'debugbar' . DIRECTORY_SEPARATOR . 'index.html');
         $this->assertStringContainsString('Debugbar cleared.', $result);
     }
 }
diff --git a/writable/index.html b/writable/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function run(array $params)`
`57`	`57`	`{`
`58`	`58`	`helper('filesystem');`
`59`	`59`
`60`		`- if (! delete_files(WRITEPATH . 'debugbar')) {`
	`60`	`+ if (! delete_files(WRITEPATH . 'debugbar', false, true)) {`
`61`	`61`	`// @codeCoverageIgnoreStart`
`62`	`62`	`CLI::error('Error deleting the debugbar JSON files.');`
`63`	`63`	`CLI::newLine();`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function testClearDebugbarWorks(): void`
`61`	`61`	`$result = $this->getStreamFilterBuffer();`
`62`	`62`
`63`	`63`	`$this->assertFileDoesNotExist(WRITEPATH . 'debugbar' . DIRECTORY_SEPARATOR . "debugbar_{$this->time}.json");`
`64`		`- $this->assertFileExists(WRITEPATH . 'debugbar' . DIRECTORY_SEPARATOR . '.gitkeep');`
	`64`	`+ $this->assertFileExists(WRITEPATH . 'debugbar' . DIRECTORY_SEPARATOR . 'index.html');`
`65`	`65`	`$this->assertStringContainsString('Debugbar cleared.', $result);`
`66`	`66`	`}`
`67`	`67`	`}`