Skip to content

5.x: upgrade to PHPUnit 10#940

Merged
markstory merged 1 commit into
5.xfrom
5.x-phpunit10
May 31, 2023
Merged

5.x: upgrade to PHPUnit 10#940
markstory merged 1 commit into
5.xfrom
5.x-phpunit10

Conversation

@LordSimal

Copy link
Copy Markdown
Contributor

@LordSimal LordSimal added this to the 5.x milestone May 30, 2023
@LordSimal LordSimal changed the title 5.x: convert to PHPUnit 10 5.x: upgrade to PHPUnit 10 May 30, 2023
Comment thread composer.json Outdated
"DebugKit\\Test\\": "tests/",
"DebugKit\\TestApp\\": "tests/test_app/",
"DebugkitTestPlugin\\": "tests/test_app/Plugin/DebugkitTestPlugin/src/"
"DebugKit\\TestApp\\": "tests/TestApp/",

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer having test_app over TestApp.

Comment thread src/ToolbarService.php
public function isEnabled(): bool
{
if (isset($GLOBALS['__PHPUNIT_BOOTSTRAP'])) {
if (defined('PHPUNIT_COMPOSER_INSTALL') && !$GLOBALS['FORCE_DEBUGKIT_TOOLBAR']) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Of course they break my hacks 😆

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just re-introduced a new hack 😁

@markstory
markstory merged commit 0bb4002 into 5.x May 31, 2023
@markstory
markstory deleted the 5.x-phpunit10 branch May 31, 2023 03:25
$this->assertSame('Sql Log', $result->panels[11]->title);

$timeStamp = filemtime(Plugin::path('DebugKit') . 'webroot' . DS . 'js' . DS . 'main.js');
$timeStamp = filectime(Plugin::path('DebugKit') . 'webroot' . DS . 'js' . DS . 'main.js');

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be inject-iframe.js here and keep using filemtime.

Line was previously incorrectly updated when .js file was renamed. And ToolbarService::getToolbarUrl‎ is using filemtime.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried that but for some reason its not working... haven't looked too deep into it though.

@LordSimal LordSimal mentioned this pull request May 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants