-
Notifications
You must be signed in to change notification settings - Fork 2k
fix: debug toolbar logs collector behavior on isEmpty()
#9724
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
paulbalandan
merged 5 commits into
codeigniter4:develop
from
mjomble:fix-debug-toolbar-logs
Oct 1, 2025
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
d955317
fix: Debug toolbar logs controller
mjomble 6a53cae
test: added test for toolbar logs collector (#9724)
mjomble bf80e0f
docs: updated changelog
mjomble 11c0d93
Merge branch 'develop' into fix-debug-toolbar-logs
mjomble d87232d
docs: tweaked changelog
mjomble File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * This file is part of CodeIgniter 4 framework. | ||
| * | ||
| * (c) CodeIgniter Foundation <[email protected]> | ||
| * | ||
| * For the full copyright and license information, please view | ||
| * the LICENSE file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace CodeIgniter\Debug\Toolbar\Collectors; | ||
|
|
||
| use CodeIgniter\Log\Logger; | ||
| use CodeIgniter\Test\CIUnitTestCase; | ||
| use Config\Logger as LoggerConfig; | ||
| use Config\Services; | ||
| use PHPUnit\Framework\Attributes\Group; | ||
|
|
||
| /** | ||
| * @internal | ||
| */ | ||
| #[Group('Others')] | ||
| final class LogsTest extends CIUnitTestCase | ||
| { | ||
| private Logger $logger; | ||
|
|
||
| protected function setUp(): void | ||
| { | ||
| parent::setUp(); | ||
|
|
||
| // The logs collector relies on the logger being in debug mode | ||
| // so it would populate logCache. | ||
| $this->logger = new Logger(new LoggerConfig(), debug: true); | ||
| Services::injectMock('logger', $this->logger); | ||
| } | ||
|
|
||
| public function testDisplay(): void | ||
| { | ||
| // log_message() always creates a new TestLogger instance while | ||
| // testing, so we need to log directly to our instance. | ||
| $this->logger->error('Test error'); | ||
| $this->logger->info('Test info'); | ||
|
|
||
| $collector = new Logs(); | ||
| $result = $collector->display(); | ||
|
|
||
| $this->assertArrayHasKey('logs', $result); | ||
| $this->assertCount(2, $result['logs']); | ||
| $this->assertSame('error', $result['logs'][0]['level']); | ||
| $this->assertSame('Test error', $result['logs'][0]['msg']); | ||
| $this->assertSame('info', $result['logs'][1]['level']); | ||
| $this->assertSame('Test info', $result['logs'][1]['msg']); | ||
| } | ||
|
|
||
| public function testEmpty(): void | ||
| { | ||
| $collector = new Logs(); | ||
| $this->assertTrue($collector->isEmpty()); | ||
| } | ||
|
|
||
| public function testNotEmpty(): void | ||
| { | ||
| $this->logger->warning('Test warning'); | ||
|
|
||
| $collector = new Logs(); | ||
| $this->assertFalse($collector->isEmpty()); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.