chore: Update phpunit to ^10.5.16 || ^11.2#9080

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.

Sign up for GitHub

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 2 commits into from
Jul 28, 2024
Merged

chore: Update phpunit to ^10.5.16 || ^11.2#9080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab87a9c
Update phpunit to `^10.5.16 || ^11.2`
paulbalandan Jul 26, 2024
e33e6f2
Fix phpunit errors
paulbalandan Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion admin/framework/composer.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
"kint-php/kint": "^5.0.4",
"mikey179/vfsstream": "^1.6",
"nexusphp/cs-config": "^3.6",
"phpunit/phpunit": "^10.5.16",
"phpunit/phpunit": "^10.5.16 || ^11.2",
"predis/predis": "^1.1 || ^2.0"
},
"suggest": {
Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,8 @@
"phpstan/extension-installer": "^1.4",
"phpstan/phpstan": "^1.11",
"phpstan/phpstan-strict-rules": "^1.6",
"phpunit/phpcov": "^9.0.2",
"phpunit/phpunit": "^10.5.16",
"phpunit/phpcov": "^9.0.2 || ^10.0",
"phpunit/phpunit": "^10.5.16 || ^11.2",
"predis/predis": "^1.1 || ^2.0",
"rector/rector": "1.2.2"
},
Expand Down
6 changes: 2 additions & 4 deletions tests/system/Autoloader/AutoloaderTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use RuntimeException;
use UnnamespacedClass;

Expand DownExpand Up@@ -394,12 +395,9 @@ public function testAutoloaderLoadsNonClassFiles(): void

#[PreserveGlobalState(false)]
#[RunInSeparateProcess]
#[WithoutErrorHandler]
public function testLoadHelpers(): void
{
// Workaround for errors on PHPUnit 10 and PHP 8.3.
// See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
restore_error_handler();

$config = new Autoload();
$config->helpers[] = 'form';

Expand Down
6 changes: 2 additions & 4 deletions tests/system/CodeIgniterTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use Tests\Support\Filters\Customfilter;
use Tests\Support\Filters\RedirectFilter;

Expand All@@ -48,15 +49,12 @@ final class CodeIgniterTest extends CIUnitTestCase
private CodeIgniter $codeigniter;
protected $routes;

#[WithoutErrorHandler]
protected function setUp(): void
{
parent::setUp();
$this->resetServices();

// Workaround for errors on PHPUnit 10 and PHP 8.3.
// See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
restore_error_handler();

$_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';

$this->codeigniter = new MockCodeIgniter(new App());
Expand Down
6 changes: 2 additions & 4 deletions tests/system/Commands/GenerateKeyTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
* @internal
Expand All@@ -31,6 +32,7 @@ final class GenerateKeyTest extends CIUnitTestCase
private string $envPath;
private string $backupEnvPath;

#[WithoutErrorHandler]
protected function setUp(): void
{
parent::setUp();
Expand All@@ -43,10 +45,6 @@ protected function setUp(): void
}

$this->resetEnvironment();

// Workaround for errors on PHPUnit 10 and PHP 8.3.
// See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
restore_error_handler();
}

protected function tearDown(): void
Expand Down
6 changes: 2 additions & 4 deletions tests/system/CommonFunctionsSendTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,22 +17,20 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
* @internal
*/
#[Group('SeparateProcess')]
final class CommonFunctionsSendTest extends CIUnitTestCase
{
#[WithoutErrorHandler]
protected function setUp(): void
{
parent::setUp();

unset($_ENV['foo'], $_SERVER['foo']);

// Workaround for errors on PHPUnit 10 and PHP 8.3.
// See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
restore_error_handler();
}

/**
Expand Down
51 changes: 10 additions & 41 deletions tests/system/CommonFunctionsTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use RuntimeException;
use stdClass;
use Tests\Support\Models\JobModel;
Expand DownExpand Up@@ -274,25 +275,19 @@ public function testEscapeRecursiveArrayRaw(): void

#[PreserveGlobalState(false)]
#[RunInSeparateProcess]
#[WithoutErrorHandler]
public function testSessionInstance(): void
{
// Workaround for errors on PHPUnit 10 and PHP 8.3.
// See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
restore_error_handler();

$this->injectSessionMock();

$this->assertInstanceOf(Session::class, session());
}

#[PreserveGlobalState(false)]
#[RunInSeparateProcess]
#[WithoutErrorHandler]
public function testSessionVariable(): void
{
// Workaround for errors on PHPUnit 10 and PHP 8.3.
// See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
restore_error_handler();

$this->injectSessionMock();

$_SESSION['notbogus'] = 'Hi there';
Expand All@@ -302,12 +297,9 @@ public function testSessionVariable(): void

#[PreserveGlobalState(false)]
#[RunInSeparateProcess]
#[WithoutErrorHandler]
public function testSessionVariableNotThere(): void
{
// Workaround for errors on PHPUnit 10 and PHP 8.3.
// See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
restore_error_handler();

$this->injectSessionMock();

$_SESSION['bogus'] = 'Hi there';
Expand DownExpand Up@@ -428,12 +420,9 @@ public function testModelExistsAbsoluteClassname(): void

#[PreserveGlobalState(false)]
#[RunInSeparateProcess]
#[WithoutErrorHandler]
public function testOldInput(): void
{
// Workaround for errors on PHPUnit 10 and PHP 8.3.
// See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
restore_error_handler();

$this->injectSessionMock();
// setup from RedirectResponseTest...
$_SERVER['REQUEST_METHOD'] = 'GET';
Expand DownExpand Up@@ -465,12 +454,9 @@ public function testOldInput(): void

#[PreserveGlobalState(false)]
#[RunInSeparateProcess]
#[WithoutErrorHandler]
public function testOldInputSerializeData(): void
{
// Workaround for errors on PHPUnit 10 and PHP 8.3.
// See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
restore_error_handler();

$this->injectSessionMock();
// setup from RedirectResponseTest...
$_SERVER['REQUEST_METHOD'] = 'GET';
Expand DownExpand Up@@ -503,12 +489,9 @@ public function testOldInputSerializeData(): void
*/
#[PreserveGlobalState(false)]
#[RunInSeparateProcess]
#[WithoutErrorHandler]
public function testOldInputArray(): void
{
// Workaround for errors on PHPUnit 10 and PHP 8.3.
// See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
restore_error_handler();

$this->injectSessionMock();
// setup from RedirectResponseTest...
$_SERVER['REQUEST_METHOD'] = 'GET';
Expand DownExpand Up@@ -622,12 +605,9 @@ public function testRedirectResponseCookies1(): void

#[PreserveGlobalState(false)]
#[RunInSeparateProcess]
#[WithoutErrorHandler]
public function testTrace(): void
{
// Workaround for errors on PHPUnit 10 and PHP 8.3.
// See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
restore_error_handler();

ob_start();
trace();
$content = ob_get_clean();
Expand All@@ -647,12 +627,9 @@ public function testViewNotSaveData(): void

#[PreserveGlobalState(false)]
#[RunInSeparateProcess]
#[WithoutErrorHandler]
public function testForceHttpsNullRequestAndResponse(): void
{
// Workaround for errors on PHPUnit 10 and PHP 8.3.
// See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
restore_error_handler();

$this->assertNull(Services::response()->header('Location'));

Services::response()->setCookie('force', 'cookie');
Expand DownExpand Up@@ -763,12 +740,9 @@ public function testDWithCSP(): void

#[PreserveGlobalState(false)]
#[RunInSeparateProcess]
#[WithoutErrorHandler]
public function testTraceWithCSP(): void
{
// Workaround for errors on PHPUnit 10 and PHP 8.3.
// See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
restore_error_handler();

$this->resetServices();

/** @var App $config */
Expand All@@ -780,11 +754,6 @@ public function testTraceWithCSP(): void

Kint::$cli_detection = false;

// Workaround for errors on PHPUnit 10 and PHP 8.3.
// See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
// `$app->initialize()` sets error handler.
restore_error_handler();

$this->expectOutputRegex('/<style class="kint-rich-style" nonce="[0-9a-z]{24}">/u');
trace();
}
Expand Down
6 changes: 2 additions & 4 deletions tests/system/Config/BaseConfigTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use PHPUnit\Framework\MockObject\MockObject;
use RegistrarConfig;
use RuntimeException;
Expand All@@ -35,6 +36,7 @@ final class BaseConfigTest extends CIUnitTestCase
{
private string $fixturesFolder;

#[WithoutErrorHandler]
protected function setUp(): void
{
parent::setUp();
Expand All@@ -54,10 +56,6 @@ protected function setUp(): void
}

BaseConfig::reset();

// Workaround for errors on PHPUnit 10 and PHP 8.3.
// See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
restore_error_handler();
}

protected function tearDown(): void
Expand Down
6 changes: 2 additions & 4 deletions tests/system/Config/DotEnvTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use TypeError;

/**
Expand All@@ -34,6 +35,7 @@ final class DotEnvTest extends CIUnitTestCase
private string $path;
private string $fixturesFolder;

#[WithoutErrorHandler]
protected function setUp(): void
{
parent::setUp();
Expand All@@ -46,10 +48,6 @@ protected function setUp(): void
$file = 'unreadable.env';
$path = rtrim($this->fixturesFolder, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $file;
chmod($path, 0644);

// Workaround for errors on PHPUnit 10 and PHP 8.3.
// See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
restore_error_handler();
}

protected function tearDown(): void
Expand Down
6 changes: 2 additions & 4 deletions tests/system/Config/ServicesTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use RuntimeException;
use Tests\Support\Config\Services;

Expand All@@ -63,15 +64,12 @@ final class ServicesTest extends CIUnitTestCase
{
private array $original;

#[WithoutErrorHandler]
protected function setUp(): void
{
parent::setUp();

$this->original = $_SERVER;

// Workaround for errors on PHPUnit 10 and PHP 8.3.
// See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
restore_error_handler();
}

protected function tearDown(): void
Expand Down
6 changes: 2 additions & 4 deletions tests/system/Events/EventsTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
* @internal
Expand All@@ -31,17 +32,14 @@ final class EventsTest extends CIUnitTestCase
*/
private Events $manager;

#[WithoutErrorHandler]
protected function setUp(): void
{
parent::setUp();

$this->manager = new MockEvents();

Events::removeAllListeners();

// Workaround for errors on PHPUnit 10 and PHP 8.3.
// See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
restore_error_handler();
}

protected function tearDown(): void
Expand Down
6 changes: 2 additions & 4 deletions tests/system/Filters/HoneypotTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
* @internal
Expand All@@ -42,6 +43,7 @@ final class HoneypotTest extends CIUnitTestCase

private ?Response $response = null;

#[WithoutErrorHandler]
protected function setUp(): void
{
parent::setUp();
Expand All@@ -51,10 +53,6 @@ protected function setUp(): void
unset($_POST[$this->honey->name]);
$_SERVER['REQUEST_METHOD'] = 'POST';
$_POST[$this->honey->name] = 'hey';

// Workaround for errors on PHPUnit 10 and PHP 8.3.
// See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
restore_error_handler();
}

public function testBeforeTriggered(): void
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
chore: Update phpunit to ^10.5.16 || ^11.2#9080

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.

 Sign up for GitHub

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 2 commits into

from

Jul 28, 2024
 Merged


chore: Update phpunit to ^10.5.16 || ^11.2#9080
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
ab87a9c

Update phpunit to `^10.5.16 || ^11.2`


paulbalandan Jul 26, 2024
e33e6f2

Fix phpunit errors


paulbalandan Jul 26, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
admin/framework/composer.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
 "kint-php/kint": "^5.0.4",
 "mikey179/vfsstream": "^1.6",
 "nexusphp/cs-config": "^3.6",
 "phpunit/phpunit": "^10.5.16",
 "phpunit/phpunit": "^10.5.16 || ^11.2",
 "predis/predis": "^1.1 || ^2.0"
 },
 "suggest": {
Expand Down

4 changes: 2 additions & 2 deletions
composer.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,8 @@
 "phpstan/extension-installer": "^1.4",
 "phpstan/phpstan": "^1.11",
 "phpstan/phpstan-strict-rules": "^1.6",
 "phpunit/phpcov": "^9.0.2",
 "phpunit/phpunit": "^10.5.16",
 "phpunit/phpcov": "^9.0.2 || ^10.0",
 "phpunit/phpunit": "^10.5.16 || ^11.2",
 "predis/predis": "^1.1 || ^2.0",
 "rector/rector": "1.2.2"
 },
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Autoloader/AutoloaderTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use RuntimeException;
use UnnamespacedClass;

Expand DownExpand Up@@ -394,12 +395,9 @@ public function testAutoloaderLoadsNonClassFiles(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testLoadHelpers(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $config = new Autoload();
 $config->helpers[] = 'form';

Expand Down

6 changes: 2 additions & 4 deletions
tests/system/CodeIgniterTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use Tests\Support\Filters\Customfilter;
use Tests\Support\Filters\RedirectFilter;

Expand All@@ -48,15 +49,12 @@ final class CodeIgniterTest extends CIUnitTestCase
 private CodeIgniter $codeigniter;
 protected $routes;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
 $this->resetServices();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';

 $this->codeigniter = new MockCodeIgniter(new App());
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Commands/GenerateKeyTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
Expand All@@ -31,6 +32,7 @@ final class GenerateKeyTest extends CIUnitTestCase
 private string $envPath;
 private string $backupEnvPath;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -43,10 +45,6 @@ protected function setUp(): void
 }

 $this->resetEnvironment();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/CommonFunctionsSendTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,22 +17,20 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
 */
#[Group('SeparateProcess')]
final class CommonFunctionsSendTest extends CIUnitTestCase
{
 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();

 unset($_ENV['foo'], $_SERVER['foo']);

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 /**
Expand Down

51 changes: 10 additions & 41 deletions
tests/system/CommonFunctionsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use RuntimeException;
use stdClass;
use Tests\Support\Models\JobModel;
Expand DownExpand Up@@ -274,25 +275,19 @@ public function testEscapeRecursiveArrayRaw(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testSessionInstance(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();

 $this->assertInstanceOf(Session::class, session());
 }

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testSessionVariable(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();

 $_SESSION['notbogus'] = 'Hi there';
Expand All@@ -302,12 +297,9 @@ public function testSessionVariable(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testSessionVariableNotThere(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();

 $_SESSION['bogus'] = 'Hi there';
Expand DownExpand Up@@ -428,12 +420,9 @@ public function testModelExistsAbsoluteClassname(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testOldInput(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();
 // setup from RedirectResponseTest...
 $_SERVER['REQUEST_METHOD'] = 'GET';
Expand DownExpand Up@@ -465,12 +454,9 @@ public function testOldInput(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testOldInputSerializeData(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();
 // setup from RedirectResponseTest...
 $_SERVER['REQUEST_METHOD'] = 'GET';
Expand DownExpand Up@@ -503,12 +489,9 @@ public function testOldInputSerializeData(): void
 */
 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testOldInputArray(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();
 // setup from RedirectResponseTest...
 $_SERVER['REQUEST_METHOD'] = 'GET';
Expand DownExpand Up@@ -622,12 +605,9 @@ public function testRedirectResponseCookies1(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testTrace(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 ob_start();
 trace();
 $content = ob_get_clean();
Expand All@@ -647,12 +627,9 @@ public function testViewNotSaveData(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testForceHttpsNullRequestAndResponse(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->assertNull(Services::response()->header('Location'));

 Services::response()->setCookie('force', 'cookie');
Expand DownExpand Up@@ -763,12 +740,9 @@ public function testDWithCSP(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testTraceWithCSP(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->resetServices();

 /** @var App $config */
Expand All@@ -780,11 +754,6 @@ public function testTraceWithCSP(): void

 Kint::$cli_detection = false;

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 // `$app->initialize()` sets error handler.
 restore_error_handler();

 $this->expectOutputRegex('/<style class="kint-rich-style" nonce="[0-9a-z]{24}">/u');
 trace();
 }
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Config/BaseConfigTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use PHPUnit\Framework\MockObject\MockObject;
use RegistrarConfig;
use RuntimeException;
Expand All@@ -35,6 +36,7 @@ final class BaseConfigTest extends CIUnitTestCase
{
 private string $fixturesFolder;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -54,10 +56,6 @@ protected function setUp(): void
 }

 BaseConfig::reset();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Config/DotEnvTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use TypeError;

/**
Expand All@@ -34,6 +35,7 @@ final class DotEnvTest extends CIUnitTestCase
 private string $path;
 private string $fixturesFolder;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -46,10 +48,6 @@ protected function setUp(): void
 $file = 'unreadable.env';
 $path = rtrim($this->fixturesFolder, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $file;
 chmod($path, 0644);

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Config/ServicesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use RuntimeException;
use Tests\Support\Config\Services;

Expand All@@ -63,15 +64,12 @@ final class ServicesTest extends CIUnitTestCase
{
 private array $original;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();

 $this->original = $_SERVER;

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Events/EventsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
Expand All@@ -31,17 +32,14 @@ final class EventsTest extends CIUnitTestCase
 */
 private Events $manager;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();

 $this->manager = new MockEvents();

 Events::removeAllListeners();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Filters/HoneypotTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
Expand All@@ -42,6 +43,7 @@ final class HoneypotTest extends CIUnitTestCase

 private ?Response $response = null;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -51,10 +53,6 @@ protected function setUp(): void
 unset($_POST[$this->honey->name]);
 $_SERVER['REQUEST_METHOD'] = 'POST';
 $_POST[$this->honey->name] = 'hey';

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 public function testBeforeTriggered(): void
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore: Update phpunit to ^10.5.16 || ^11.2#9080

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.

 Sign up for GitHub

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 2 commits into

from

Jul 28, 2024
 Merged


chore: Update phpunit to ^10.5.16 || ^11.2#9080
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
ab87a9c

Update phpunit to `^10.5.16 || ^11.2`


paulbalandan Jul 26, 2024
e33e6f2

Fix phpunit errors


paulbalandan Jul 26, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
admin/framework/composer.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
 "kint-php/kint": "^5.0.4",
 "mikey179/vfsstream": "^1.6",
 "nexusphp/cs-config": "^3.6",
 "phpunit/phpunit": "^10.5.16",
 "phpunit/phpunit": "^10.5.16 || ^11.2",
 "predis/predis": "^1.1 || ^2.0"
 },
 "suggest": {
Expand Down

4 changes: 2 additions & 2 deletions
composer.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,8 @@
 "phpstan/extension-installer": "^1.4",
 "phpstan/phpstan": "^1.11",
 "phpstan/phpstan-strict-rules": "^1.6",
 "phpunit/phpcov": "^9.0.2",
 "phpunit/phpunit": "^10.5.16",
 "phpunit/phpcov": "^9.0.2 || ^10.0",
 "phpunit/phpunit": "^10.5.16 || ^11.2",
 "predis/predis": "^1.1 || ^2.0",
 "rector/rector": "1.2.2"
 },
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Autoloader/AutoloaderTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use RuntimeException;
use UnnamespacedClass;

Expand DownExpand Up@@ -394,12 +395,9 @@ public function testAutoloaderLoadsNonClassFiles(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testLoadHelpers(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $config = new Autoload();
 $config->helpers[] = 'form';

Expand Down

6 changes: 2 additions & 4 deletions
tests/system/CodeIgniterTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use Tests\Support\Filters\Customfilter;
use Tests\Support\Filters\RedirectFilter;

Expand All@@ -48,15 +49,12 @@ final class CodeIgniterTest extends CIUnitTestCase
 private CodeIgniter $codeigniter;
 protected $routes;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
 $this->resetServices();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';

 $this->codeigniter = new MockCodeIgniter(new App());
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Commands/GenerateKeyTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
Expand All@@ -31,6 +32,7 @@ final class GenerateKeyTest extends CIUnitTestCase
 private string $envPath;
 private string $backupEnvPath;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -43,10 +45,6 @@ protected function setUp(): void
 }

 $this->resetEnvironment();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/CommonFunctionsSendTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,22 +17,20 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
 */
#[Group('SeparateProcess')]
final class CommonFunctionsSendTest extends CIUnitTestCase
{
 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();

 unset($_ENV['foo'], $_SERVER['foo']);

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 /**
Expand Down

51 changes: 10 additions & 41 deletions
tests/system/CommonFunctionsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use RuntimeException;
use stdClass;
use Tests\Support\Models\JobModel;
Expand DownExpand Up@@ -274,25 +275,19 @@ public function testEscapeRecursiveArrayRaw(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testSessionInstance(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();

 $this->assertInstanceOf(Session::class, session());
 }

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testSessionVariable(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();

 $_SESSION['notbogus'] = 'Hi there';
Expand All@@ -302,12 +297,9 @@ public function testSessionVariable(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testSessionVariableNotThere(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();

 $_SESSION['bogus'] = 'Hi there';
Expand DownExpand Up@@ -428,12 +420,9 @@ public function testModelExistsAbsoluteClassname(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testOldInput(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();
 // setup from RedirectResponseTest...
 $_SERVER['REQUEST_METHOD'] = 'GET';
Expand DownExpand Up@@ -465,12 +454,9 @@ public function testOldInput(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testOldInputSerializeData(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();
 // setup from RedirectResponseTest...
 $_SERVER['REQUEST_METHOD'] = 'GET';
Expand DownExpand Up@@ -503,12 +489,9 @@ public function testOldInputSerializeData(): void
 */
 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testOldInputArray(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();
 // setup from RedirectResponseTest...
 $_SERVER['REQUEST_METHOD'] = 'GET';
Expand DownExpand Up@@ -622,12 +605,9 @@ public function testRedirectResponseCookies1(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testTrace(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 ob_start();
 trace();
 $content = ob_get_clean();
Expand All@@ -647,12 +627,9 @@ public function testViewNotSaveData(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testForceHttpsNullRequestAndResponse(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->assertNull(Services::response()->header('Location'));

 Services::response()->setCookie('force', 'cookie');
Expand DownExpand Up@@ -763,12 +740,9 @@ public function testDWithCSP(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testTraceWithCSP(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->resetServices();

 /** @var App $config */
Expand All@@ -780,11 +754,6 @@ public function testTraceWithCSP(): void

 Kint::$cli_detection = false;

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 // `$app->initialize()` sets error handler.
 restore_error_handler();

 $this->expectOutputRegex('/<style class="kint-rich-style" nonce="[0-9a-z]{24}">/u');
 trace();
 }
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Config/BaseConfigTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use PHPUnit\Framework\MockObject\MockObject;
use RegistrarConfig;
use RuntimeException;
Expand All@@ -35,6 +36,7 @@ final class BaseConfigTest extends CIUnitTestCase
{
 private string $fixturesFolder;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -54,10 +56,6 @@ protected function setUp(): void
 }

 BaseConfig::reset();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Config/DotEnvTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use TypeError;

/**
Expand All@@ -34,6 +35,7 @@ final class DotEnvTest extends CIUnitTestCase
 private string $path;
 private string $fixturesFolder;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -46,10 +48,6 @@ protected function setUp(): void
 $file = 'unreadable.env';
 $path = rtrim($this->fixturesFolder, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $file;
 chmod($path, 0644);

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Config/ServicesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use RuntimeException;
use Tests\Support\Config\Services;

Expand All@@ -63,15 +64,12 @@ final class ServicesTest extends CIUnitTestCase
{
 private array $original;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();

 $this->original = $_SERVER;

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Events/EventsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
Expand All@@ -31,17 +32,14 @@ final class EventsTest extends CIUnitTestCase
 */
 private Events $manager;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();

 $this->manager = new MockEvents();

 Events::removeAllListeners();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Filters/HoneypotTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
Expand All@@ -42,6 +43,7 @@ final class HoneypotTest extends CIUnitTestCase

 private ?Response $response = null;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -51,10 +53,6 @@ protected function setUp(): void
 unset($_POST[$this->honey->name]);
 $_SERVER['REQUEST_METHOD'] = 'POST';
 $_POST[$this->honey->name] = 'hey';

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 public function testBeforeTriggered(): void
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore: Update phpunit to ^10.5.16 || ^11.2#9080

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.

 Sign up for GitHub

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 2 commits into

from

Jul 28, 2024
 Merged


chore: Update phpunit to ^10.5.16 || ^11.2#9080
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
ab87a9c

Update phpunit to `^10.5.16 || ^11.2`


paulbalandan Jul 26, 2024
e33e6f2

Fix phpunit errors


paulbalandan Jul 26, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
admin/framework/composer.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
 "kint-php/kint": "^5.0.4",
 "mikey179/vfsstream": "^1.6",
 "nexusphp/cs-config": "^3.6",
 "phpunit/phpunit": "^10.5.16",
 "phpunit/phpunit": "^10.5.16 || ^11.2",
 "predis/predis": "^1.1 || ^2.0"
 },
 "suggest": {
Expand Down

4 changes: 2 additions & 2 deletions
composer.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,8 @@
 "phpstan/extension-installer": "^1.4",
 "phpstan/phpstan": "^1.11",
 "phpstan/phpstan-strict-rules": "^1.6",
 "phpunit/phpcov": "^9.0.2",
 "phpunit/phpunit": "^10.5.16",
 "phpunit/phpcov": "^9.0.2 || ^10.0",
 "phpunit/phpunit": "^10.5.16 || ^11.2",
 "predis/predis": "^1.1 || ^2.0",
 "rector/rector": "1.2.2"
 },
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Autoloader/AutoloaderTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use RuntimeException;
use UnnamespacedClass;

Expand DownExpand Up@@ -394,12 +395,9 @@ public function testAutoloaderLoadsNonClassFiles(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testLoadHelpers(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $config = new Autoload();
 $config->helpers[] = 'form';

Expand Down

6 changes: 2 additions & 4 deletions
tests/system/CodeIgniterTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use Tests\Support\Filters\Customfilter;
use Tests\Support\Filters\RedirectFilter;

Expand All@@ -48,15 +49,12 @@ final class CodeIgniterTest extends CIUnitTestCase
 private CodeIgniter $codeigniter;
 protected $routes;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
 $this->resetServices();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';

 $this->codeigniter = new MockCodeIgniter(new App());
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Commands/GenerateKeyTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
Expand All@@ -31,6 +32,7 @@ final class GenerateKeyTest extends CIUnitTestCase
 private string $envPath;
 private string $backupEnvPath;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -43,10 +45,6 @@ protected function setUp(): void
 }

 $this->resetEnvironment();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/CommonFunctionsSendTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,22 +17,20 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
 */
#[Group('SeparateProcess')]
final class CommonFunctionsSendTest extends CIUnitTestCase
{
 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();

 unset($_ENV['foo'], $_SERVER['foo']);

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 /**
Expand Down

51 changes: 10 additions & 41 deletions
tests/system/CommonFunctionsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use RuntimeException;
use stdClass;
use Tests\Support\Models\JobModel;
Expand DownExpand Up@@ -274,25 +275,19 @@ public function testEscapeRecursiveArrayRaw(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testSessionInstance(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();

 $this->assertInstanceOf(Session::class, session());
 }

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testSessionVariable(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();

 $_SESSION['notbogus'] = 'Hi there';
Expand All@@ -302,12 +297,9 @@ public function testSessionVariable(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testSessionVariableNotThere(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();

 $_SESSION['bogus'] = 'Hi there';
Expand DownExpand Up@@ -428,12 +420,9 @@ public function testModelExistsAbsoluteClassname(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testOldInput(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();
 // setup from RedirectResponseTest...
 $_SERVER['REQUEST_METHOD'] = 'GET';
Expand DownExpand Up@@ -465,12 +454,9 @@ public function testOldInput(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testOldInputSerializeData(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();
 // setup from RedirectResponseTest...
 $_SERVER['REQUEST_METHOD'] = 'GET';
Expand DownExpand Up@@ -503,12 +489,9 @@ public function testOldInputSerializeData(): void
 */
 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testOldInputArray(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();
 // setup from RedirectResponseTest...
 $_SERVER['REQUEST_METHOD'] = 'GET';
Expand DownExpand Up@@ -622,12 +605,9 @@ public function testRedirectResponseCookies1(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testTrace(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 ob_start();
 trace();
 $content = ob_get_clean();
Expand All@@ -647,12 +627,9 @@ public function testViewNotSaveData(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testForceHttpsNullRequestAndResponse(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->assertNull(Services::response()->header('Location'));

 Services::response()->setCookie('force', 'cookie');
Expand DownExpand Up@@ -763,12 +740,9 @@ public function testDWithCSP(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testTraceWithCSP(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->resetServices();

 /** @var App $config */
Expand All@@ -780,11 +754,6 @@ public function testTraceWithCSP(): void

 Kint::$cli_detection = false;

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 // `$app->initialize()` sets error handler.
 restore_error_handler();

 $this->expectOutputRegex('/<style class="kint-rich-style" nonce="[0-9a-z]{24}">/u');
 trace();
 }
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Config/BaseConfigTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use PHPUnit\Framework\MockObject\MockObject;
use RegistrarConfig;
use RuntimeException;
Expand All@@ -35,6 +36,7 @@ final class BaseConfigTest extends CIUnitTestCase
{
 private string $fixturesFolder;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -54,10 +56,6 @@ protected function setUp(): void
 }

 BaseConfig::reset();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Config/DotEnvTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use TypeError;

/**
Expand All@@ -34,6 +35,7 @@ final class DotEnvTest extends CIUnitTestCase
 private string $path;
 private string $fixturesFolder;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -46,10 +48,6 @@ protected function setUp(): void
 $file = 'unreadable.env';
 $path = rtrim($this->fixturesFolder, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $file;
 chmod($path, 0644);

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Config/ServicesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use RuntimeException;
use Tests\Support\Config\Services;

Expand All@@ -63,15 +64,12 @@ final class ServicesTest extends CIUnitTestCase
{
 private array $original;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();

 $this->original = $_SERVER;

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Events/EventsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
Expand All@@ -31,17 +32,14 @@ final class EventsTest extends CIUnitTestCase
 */
 private Events $manager;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();

 $this->manager = new MockEvents();

 Events::removeAllListeners();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Filters/HoneypotTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
Expand All@@ -42,6 +43,7 @@ final class HoneypotTest extends CIUnitTestCase

 private ?Response $response = null;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -51,10 +53,6 @@ protected function setUp(): void
 unset($_POST[$this->honey->name]);
 $_SERVER['REQUEST_METHOD'] = 'POST';
 $_POST[$this->honey->name] = 'hey';

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 public function testBeforeTriggered(): void
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
chore: Update phpunit to ^10.5.16 || ^11.2#9080

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.

 Sign up for GitHub

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 2 commits into

from

Jul 28, 2024
 Merged


chore: Update phpunit to ^10.5.16 || ^11.2#9080
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
ab87a9c

Update phpunit to `^10.5.16 || ^11.2`


paulbalandan Jul 26, 2024
e33e6f2

Fix phpunit errors


paulbalandan Jul 26, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
admin/framework/composer.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
 "kint-php/kint": "^5.0.4",
 "mikey179/vfsstream": "^1.6",
 "nexusphp/cs-config": "^3.6",
 "phpunit/phpunit": "^10.5.16",
 "phpunit/phpunit": "^10.5.16 || ^11.2",
 "predis/predis": "^1.1 || ^2.0"
 },
 "suggest": {
Expand Down

4 changes: 2 additions & 2 deletions
composer.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,8 @@
 "phpstan/extension-installer": "^1.4",
 "phpstan/phpstan": "^1.11",
 "phpstan/phpstan-strict-rules": "^1.6",
 "phpunit/phpcov": "^9.0.2",
 "phpunit/phpunit": "^10.5.16",
 "phpunit/phpcov": "^9.0.2 || ^10.0",
 "phpunit/phpunit": "^10.5.16 || ^11.2",
 "predis/predis": "^1.1 || ^2.0",
 "rector/rector": "1.2.2"
 },
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Autoloader/AutoloaderTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use RuntimeException;
use UnnamespacedClass;

Expand DownExpand Up@@ -394,12 +395,9 @@ public function testAutoloaderLoadsNonClassFiles(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testLoadHelpers(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $config = new Autoload();
 $config->helpers[] = 'form';

Expand Down

6 changes: 2 additions & 4 deletions
tests/system/CodeIgniterTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use Tests\Support\Filters\Customfilter;
use Tests\Support\Filters\RedirectFilter;

Expand All@@ -48,15 +49,12 @@ final class CodeIgniterTest extends CIUnitTestCase
 private CodeIgniter $codeigniter;
 protected $routes;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
 $this->resetServices();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';

 $this->codeigniter = new MockCodeIgniter(new App());
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Commands/GenerateKeyTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
Expand All@@ -31,6 +32,7 @@ final class GenerateKeyTest extends CIUnitTestCase
 private string $envPath;
 private string $backupEnvPath;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -43,10 +45,6 @@ protected function setUp(): void
 }

 $this->resetEnvironment();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/CommonFunctionsSendTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,22 +17,20 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
 */
#[Group('SeparateProcess')]
final class CommonFunctionsSendTest extends CIUnitTestCase
{
 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();

 unset($_ENV['foo'], $_SERVER['foo']);

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 /**
Expand Down

51 changes: 10 additions & 41 deletions
tests/system/CommonFunctionsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use RuntimeException;
use stdClass;
use Tests\Support\Models\JobModel;
Expand DownExpand Up@@ -274,25 +275,19 @@ public function testEscapeRecursiveArrayRaw(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testSessionInstance(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();

 $this->assertInstanceOf(Session::class, session());
 }

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testSessionVariable(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();

 $_SESSION['notbogus'] = 'Hi there';
Expand All@@ -302,12 +297,9 @@ public function testSessionVariable(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testSessionVariableNotThere(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();

 $_SESSION['bogus'] = 'Hi there';
Expand DownExpand Up@@ -428,12 +420,9 @@ public function testModelExistsAbsoluteClassname(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testOldInput(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();
 // setup from RedirectResponseTest...
 $_SERVER['REQUEST_METHOD'] = 'GET';
Expand DownExpand Up@@ -465,12 +454,9 @@ public function testOldInput(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testOldInputSerializeData(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();
 // setup from RedirectResponseTest...
 $_SERVER['REQUEST_METHOD'] = 'GET';
Expand DownExpand Up@@ -503,12 +489,9 @@ public function testOldInputSerializeData(): void
 */
 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testOldInputArray(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();
 // setup from RedirectResponseTest...
 $_SERVER['REQUEST_METHOD'] = 'GET';
Expand DownExpand Up@@ -622,12 +605,9 @@ public function testRedirectResponseCookies1(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testTrace(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 ob_start();
 trace();
 $content = ob_get_clean();
Expand All@@ -647,12 +627,9 @@ public function testViewNotSaveData(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testForceHttpsNullRequestAndResponse(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->assertNull(Services::response()->header('Location'));

 Services::response()->setCookie('force', 'cookie');
Expand DownExpand Up@@ -763,12 +740,9 @@ public function testDWithCSP(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testTraceWithCSP(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->resetServices();

 /** @var App $config */
Expand All@@ -780,11 +754,6 @@ public function testTraceWithCSP(): void

 Kint::$cli_detection = false;

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 // `$app->initialize()` sets error handler.
 restore_error_handler();

 $this->expectOutputRegex('/<style class="kint-rich-style" nonce="[0-9a-z]{24}">/u');
 trace();
 }
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Config/BaseConfigTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use PHPUnit\Framework\MockObject\MockObject;
use RegistrarConfig;
use RuntimeException;
Expand All@@ -35,6 +36,7 @@ final class BaseConfigTest extends CIUnitTestCase
{
 private string $fixturesFolder;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -54,10 +56,6 @@ protected function setUp(): void
 }

 BaseConfig::reset();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Config/DotEnvTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use TypeError;

/**
Expand All@@ -34,6 +35,7 @@ final class DotEnvTest extends CIUnitTestCase
 private string $path;
 private string $fixturesFolder;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -46,10 +48,6 @@ protected function setUp(): void
 $file = 'unreadable.env';
 $path = rtrim($this->fixturesFolder, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $file;
 chmod($path, 0644);

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Config/ServicesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use RuntimeException;
use Tests\Support\Config\Services;

Expand All@@ -63,15 +64,12 @@ final class ServicesTest extends CIUnitTestCase
{
 private array $original;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();

 $this->original = $_SERVER;

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Events/EventsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
Expand All@@ -31,17 +32,14 @@ final class EventsTest extends CIUnitTestCase
 */
 private Events $manager;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();

 $this->manager = new MockEvents();

 Events::removeAllListeners();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Filters/HoneypotTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
Expand All@@ -42,6 +43,7 @@ final class HoneypotTest extends CIUnitTestCase

 private ?Response $response = null;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -51,10 +53,6 @@ protected function setUp(): void
 unset($_POST[$this->honey->name]);
 $_SERVER['REQUEST_METHOD'] = 'POST';
 $_POST[$this->honey->name] = 'hey';

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 public function testBeforeTriggered(): void
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore: Update phpunit to ^10.5.16 || ^11.2#9080

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.

 Sign up for GitHub

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 2 commits into

from

Jul 28, 2024
 Merged


chore: Update phpunit to ^10.5.16 || ^11.2#9080
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
ab87a9c

Update phpunit to `^10.5.16 || ^11.2`


paulbalandan Jul 26, 2024
e33e6f2

Fix phpunit errors


paulbalandan Jul 26, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
admin/framework/composer.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
 "kint-php/kint": "^5.0.4",
 "mikey179/vfsstream": "^1.6",
 "nexusphp/cs-config": "^3.6",
 "phpunit/phpunit": "^10.5.16",
 "phpunit/phpunit": "^10.5.16 || ^11.2",
 "predis/predis": "^1.1 || ^2.0"
 },
 "suggest": {
Expand Down

4 changes: 2 additions & 2 deletions
composer.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,8 @@
 "phpstan/extension-installer": "^1.4",
 "phpstan/phpstan": "^1.11",
 "phpstan/phpstan-strict-rules": "^1.6",
 "phpunit/phpcov": "^9.0.2",
 "phpunit/phpunit": "^10.5.16",
 "phpunit/phpcov": "^9.0.2 || ^10.0",
 "phpunit/phpunit": "^10.5.16 || ^11.2",
 "predis/predis": "^1.1 || ^2.0",
 "rector/rector": "1.2.2"
 },
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Autoloader/AutoloaderTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use RuntimeException;
use UnnamespacedClass;

Expand DownExpand Up@@ -394,12 +395,9 @@ public function testAutoloaderLoadsNonClassFiles(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testLoadHelpers(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $config = new Autoload();
 $config->helpers[] = 'form';

Expand Down

6 changes: 2 additions & 4 deletions
tests/system/CodeIgniterTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use Tests\Support\Filters\Customfilter;
use Tests\Support\Filters\RedirectFilter;

Expand All@@ -48,15 +49,12 @@ final class CodeIgniterTest extends CIUnitTestCase
 private CodeIgniter $codeigniter;
 protected $routes;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
 $this->resetServices();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';

 $this->codeigniter = new MockCodeIgniter(new App());
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Commands/GenerateKeyTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
Expand All@@ -31,6 +32,7 @@ final class GenerateKeyTest extends CIUnitTestCase
 private string $envPath;
 private string $backupEnvPath;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -43,10 +45,6 @@ protected function setUp(): void
 }

 $this->resetEnvironment();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/CommonFunctionsSendTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,22 +17,20 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
 */
#[Group('SeparateProcess')]
final class CommonFunctionsSendTest extends CIUnitTestCase
{
 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();

 unset($_ENV['foo'], $_SERVER['foo']);

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 /**
Expand Down

51 changes: 10 additions & 41 deletions
tests/system/CommonFunctionsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use RuntimeException;
use stdClass;
use Tests\Support\Models\JobModel;
Expand DownExpand Up@@ -274,25 +275,19 @@ public function testEscapeRecursiveArrayRaw(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testSessionInstance(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();

 $this->assertInstanceOf(Session::class, session());
 }

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testSessionVariable(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();

 $_SESSION['notbogus'] = 'Hi there';
Expand All@@ -302,12 +297,9 @@ public function testSessionVariable(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testSessionVariableNotThere(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();

 $_SESSION['bogus'] = 'Hi there';
Expand DownExpand Up@@ -428,12 +420,9 @@ public function testModelExistsAbsoluteClassname(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testOldInput(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();
 // setup from RedirectResponseTest...
 $_SERVER['REQUEST_METHOD'] = 'GET';
Expand DownExpand Up@@ -465,12 +454,9 @@ public function testOldInput(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testOldInputSerializeData(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();
 // setup from RedirectResponseTest...
 $_SERVER['REQUEST_METHOD'] = 'GET';
Expand DownExpand Up@@ -503,12 +489,9 @@ public function testOldInputSerializeData(): void
 */
 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testOldInputArray(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();
 // setup from RedirectResponseTest...
 $_SERVER['REQUEST_METHOD'] = 'GET';
Expand DownExpand Up@@ -622,12 +605,9 @@ public function testRedirectResponseCookies1(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testTrace(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 ob_start();
 trace();
 $content = ob_get_clean();
Expand All@@ -647,12 +627,9 @@ public function testViewNotSaveData(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testForceHttpsNullRequestAndResponse(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->assertNull(Services::response()->header('Location'));

 Services::response()->setCookie('force', 'cookie');
Expand DownExpand Up@@ -763,12 +740,9 @@ public function testDWithCSP(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testTraceWithCSP(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->resetServices();

 /** @var App $config */
Expand All@@ -780,11 +754,6 @@ public function testTraceWithCSP(): void

 Kint::$cli_detection = false;

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 // `$app->initialize()` sets error handler.
 restore_error_handler();

 $this->expectOutputRegex('/<style class="kint-rich-style" nonce="[0-9a-z]{24}">/u');
 trace();
 }
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Config/BaseConfigTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use PHPUnit\Framework\MockObject\MockObject;
use RegistrarConfig;
use RuntimeException;
Expand All@@ -35,6 +36,7 @@ final class BaseConfigTest extends CIUnitTestCase
{
 private string $fixturesFolder;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -54,10 +56,6 @@ protected function setUp(): void
 }

 BaseConfig::reset();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Config/DotEnvTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use TypeError;

/**
Expand All@@ -34,6 +35,7 @@ final class DotEnvTest extends CIUnitTestCase
 private string $path;
 private string $fixturesFolder;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -46,10 +48,6 @@ protected function setUp(): void
 $file = 'unreadable.env';
 $path = rtrim($this->fixturesFolder, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $file;
 chmod($path, 0644);

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Config/ServicesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use RuntimeException;
use Tests\Support\Config\Services;

Expand All@@ -63,15 +64,12 @@ final class ServicesTest extends CIUnitTestCase
{
 private array $original;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();

 $this->original = $_SERVER;

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Events/EventsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
Expand All@@ -31,17 +32,14 @@ final class EventsTest extends CIUnitTestCase
 */
 private Events $manager;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();

 $this->manager = new MockEvents();

 Events::removeAllListeners();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Filters/HoneypotTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
Expand All@@ -42,6 +43,7 @@ final class HoneypotTest extends CIUnitTestCase

 private ?Response $response = null;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -51,10 +53,6 @@ protected function setUp(): void
 unset($_POST[$this->honey->name]);
 $_SERVER['REQUEST_METHOD'] = 'POST';
 $_POST[$this->honey->name] = 'hey';

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 public function testBeforeTriggered(): void
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore: Update phpunit to ^10.5.16 || ^11.2#9080

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.

 Sign up for GitHub

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 2 commits into

from

Jul 28, 2024
 Merged


chore: Update phpunit to ^10.5.16 || ^11.2#9080
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
ab87a9c

Update phpunit to `^10.5.16 || ^11.2`


paulbalandan Jul 26, 2024
e33e6f2

Fix phpunit errors


paulbalandan Jul 26, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
admin/framework/composer.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
 "kint-php/kint": "^5.0.4",
 "mikey179/vfsstream": "^1.6",
 "nexusphp/cs-config": "^3.6",
 "phpunit/phpunit": "^10.5.16",
 "phpunit/phpunit": "^10.5.16 || ^11.2",
 "predis/predis": "^1.1 || ^2.0"
 },
 "suggest": {
Expand Down

4 changes: 2 additions & 2 deletions
composer.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,8 @@
 "phpstan/extension-installer": "^1.4",
 "phpstan/phpstan": "^1.11",
 "phpstan/phpstan-strict-rules": "^1.6",
 "phpunit/phpcov": "^9.0.2",
 "phpunit/phpunit": "^10.5.16",
 "phpunit/phpcov": "^9.0.2 || ^10.0",
 "phpunit/phpunit": "^10.5.16 || ^11.2",
 "predis/predis": "^1.1 || ^2.0",
 "rector/rector": "1.2.2"
 },
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Autoloader/AutoloaderTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use RuntimeException;
use UnnamespacedClass;

Expand DownExpand Up@@ -394,12 +395,9 @@ public function testAutoloaderLoadsNonClassFiles(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testLoadHelpers(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $config = new Autoload();
 $config->helpers[] = 'form';

Expand Down

6 changes: 2 additions & 4 deletions
tests/system/CodeIgniterTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use Tests\Support\Filters\Customfilter;
use Tests\Support\Filters\RedirectFilter;

Expand All@@ -48,15 +49,12 @@ final class CodeIgniterTest extends CIUnitTestCase
 private CodeIgniter $codeigniter;
 protected $routes;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
 $this->resetServices();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';

 $this->codeigniter = new MockCodeIgniter(new App());
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Commands/GenerateKeyTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
Expand All@@ -31,6 +32,7 @@ final class GenerateKeyTest extends CIUnitTestCase
 private string $envPath;
 private string $backupEnvPath;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -43,10 +45,6 @@ protected function setUp(): void
 }

 $this->resetEnvironment();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/CommonFunctionsSendTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,22 +17,20 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
 */
#[Group('SeparateProcess')]
final class CommonFunctionsSendTest extends CIUnitTestCase
{
 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();

 unset($_ENV['foo'], $_SERVER['foo']);

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 /**
Expand Down

51 changes: 10 additions & 41 deletions
tests/system/CommonFunctionsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use RuntimeException;
use stdClass;
use Tests\Support\Models\JobModel;
Expand DownExpand Up@@ -274,25 +275,19 @@ public function testEscapeRecursiveArrayRaw(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testSessionInstance(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();

 $this->assertInstanceOf(Session::class, session());
 }

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testSessionVariable(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();

 $_SESSION['notbogus'] = 'Hi there';
Expand All@@ -302,12 +297,9 @@ public function testSessionVariable(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testSessionVariableNotThere(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();

 $_SESSION['bogus'] = 'Hi there';
Expand DownExpand Up@@ -428,12 +420,9 @@ public function testModelExistsAbsoluteClassname(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testOldInput(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();
 // setup from RedirectResponseTest...
 $_SERVER['REQUEST_METHOD'] = 'GET';
Expand DownExpand Up@@ -465,12 +454,9 @@ public function testOldInput(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testOldInputSerializeData(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();
 // setup from RedirectResponseTest...
 $_SERVER['REQUEST_METHOD'] = 'GET';
Expand DownExpand Up@@ -503,12 +489,9 @@ public function testOldInputSerializeData(): void
 */
 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testOldInputArray(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();
 // setup from RedirectResponseTest...
 $_SERVER['REQUEST_METHOD'] = 'GET';
Expand DownExpand Up@@ -622,12 +605,9 @@ public function testRedirectResponseCookies1(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testTrace(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 ob_start();
 trace();
 $content = ob_get_clean();
Expand All@@ -647,12 +627,9 @@ public function testViewNotSaveData(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testForceHttpsNullRequestAndResponse(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->assertNull(Services::response()->header('Location'));

 Services::response()->setCookie('force', 'cookie');
Expand DownExpand Up@@ -763,12 +740,9 @@ public function testDWithCSP(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testTraceWithCSP(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->resetServices();

 /** @var App $config */
Expand All@@ -780,11 +754,6 @@ public function testTraceWithCSP(): void

 Kint::$cli_detection = false;

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 // `$app->initialize()` sets error handler.
 restore_error_handler();

 $this->expectOutputRegex('/<style class="kint-rich-style" nonce="[0-9a-z]{24}">/u');
 trace();
 }
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Config/BaseConfigTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use PHPUnit\Framework\MockObject\MockObject;
use RegistrarConfig;
use RuntimeException;
Expand All@@ -35,6 +36,7 @@ final class BaseConfigTest extends CIUnitTestCase
{
 private string $fixturesFolder;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -54,10 +56,6 @@ protected function setUp(): void
 }

 BaseConfig::reset();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Config/DotEnvTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use TypeError;

/**
Expand All@@ -34,6 +35,7 @@ final class DotEnvTest extends CIUnitTestCase
 private string $path;
 private string $fixturesFolder;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -46,10 +48,6 @@ protected function setUp(): void
 $file = 'unreadable.env';
 $path = rtrim($this->fixturesFolder, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $file;
 chmod($path, 0644);

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Config/ServicesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use RuntimeException;
use Tests\Support\Config\Services;

Expand All@@ -63,15 +64,12 @@ final class ServicesTest extends CIUnitTestCase
{
 private array $original;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();

 $this->original = $_SERVER;

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Events/EventsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
Expand All@@ -31,17 +32,14 @@ final class EventsTest extends CIUnitTestCase
 */
 private Events $manager;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();

 $this->manager = new MockEvents();

 Events::removeAllListeners();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Filters/HoneypotTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
Expand All@@ -42,6 +43,7 @@ final class HoneypotTest extends CIUnitTestCase

 private ?Response $response = null;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -51,10 +53,6 @@ protected function setUp(): void
 unset($_POST[$this->honey->name]);
 $_SERVER['REQUEST_METHOD'] = 'POST';
 $_POST[$this->honey->name] = 'hey';

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 public function testBeforeTriggered(): void
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
chore: Update phpunit to ^10.5.16 || ^11.2#9080

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.

 Sign up for GitHub

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 2 commits into

from

Jul 28, 2024
 Merged


chore: Update phpunit to ^10.5.16 || ^11.2#9080
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
ab87a9c

Update phpunit to `^10.5.16 || ^11.2`


paulbalandan Jul 26, 2024
e33e6f2

Fix phpunit errors


paulbalandan Jul 26, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
admin/framework/composer.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
 "kint-php/kint": "^5.0.4",
 "mikey179/vfsstream": "^1.6",
 "nexusphp/cs-config": "^3.6",
 "phpunit/phpunit": "^10.5.16",
 "phpunit/phpunit": "^10.5.16 || ^11.2",
 "predis/predis": "^1.1 || ^2.0"
 },
 "suggest": {
Expand Down

4 changes: 2 additions & 2 deletions
composer.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,8 @@
 "phpstan/extension-installer": "^1.4",
 "phpstan/phpstan": "^1.11",
 "phpstan/phpstan-strict-rules": "^1.6",
 "phpunit/phpcov": "^9.0.2",
 "phpunit/phpunit": "^10.5.16",
 "phpunit/phpcov": "^9.0.2 || ^10.0",
 "phpunit/phpunit": "^10.5.16 || ^11.2",
 "predis/predis": "^1.1 || ^2.0",
 "rector/rector": "1.2.2"
 },
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Autoloader/AutoloaderTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use RuntimeException;
use UnnamespacedClass;

Expand DownExpand Up@@ -394,12 +395,9 @@ public function testAutoloaderLoadsNonClassFiles(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testLoadHelpers(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $config = new Autoload();
 $config->helpers[] = 'form';

Expand Down

6 changes: 2 additions & 4 deletions
tests/system/CodeIgniterTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use Tests\Support\Filters\Customfilter;
use Tests\Support\Filters\RedirectFilter;

Expand All@@ -48,15 +49,12 @@ final class CodeIgniterTest extends CIUnitTestCase
 private CodeIgniter $codeigniter;
 protected $routes;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
 $this->resetServices();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';

 $this->codeigniter = new MockCodeIgniter(new App());
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Commands/GenerateKeyTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
Expand All@@ -31,6 +32,7 @@ final class GenerateKeyTest extends CIUnitTestCase
 private string $envPath;
 private string $backupEnvPath;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -43,10 +45,6 @@ protected function setUp(): void
 }

 $this->resetEnvironment();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/CommonFunctionsSendTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,22 +17,20 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
 */
#[Group('SeparateProcess')]
final class CommonFunctionsSendTest extends CIUnitTestCase
{
 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();

 unset($_ENV['foo'], $_SERVER['foo']);

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 /**
Expand Down

51 changes: 10 additions & 41 deletions
tests/system/CommonFunctionsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use RuntimeException;
use stdClass;
use Tests\Support\Models\JobModel;
Expand DownExpand Up@@ -274,25 +275,19 @@ public function testEscapeRecursiveArrayRaw(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testSessionInstance(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();

 $this->assertInstanceOf(Session::class, session());
 }

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testSessionVariable(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();

 $_SESSION['notbogus'] = 'Hi there';
Expand All@@ -302,12 +297,9 @@ public function testSessionVariable(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testSessionVariableNotThere(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();

 $_SESSION['bogus'] = 'Hi there';
Expand DownExpand Up@@ -428,12 +420,9 @@ public function testModelExistsAbsoluteClassname(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testOldInput(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();
 // setup from RedirectResponseTest...
 $_SERVER['REQUEST_METHOD'] = 'GET';
Expand DownExpand Up@@ -465,12 +454,9 @@ public function testOldInput(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testOldInputSerializeData(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();
 // setup from RedirectResponseTest...
 $_SERVER['REQUEST_METHOD'] = 'GET';
Expand DownExpand Up@@ -503,12 +489,9 @@ public function testOldInputSerializeData(): void
 */
 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testOldInputArray(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->injectSessionMock();
 // setup from RedirectResponseTest...
 $_SERVER['REQUEST_METHOD'] = 'GET';
Expand DownExpand Up@@ -622,12 +605,9 @@ public function testRedirectResponseCookies1(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testTrace(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 ob_start();
 trace();
 $content = ob_get_clean();
Expand All@@ -647,12 +627,9 @@ public function testViewNotSaveData(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testForceHttpsNullRequestAndResponse(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->assertNull(Services::response()->header('Location'));

 Services::response()->setCookie('force', 'cookie');
Expand DownExpand Up@@ -763,12 +740,9 @@ public function testDWithCSP(): void

 #[PreserveGlobalState(false)]
 #[RunInSeparateProcess]
 #[WithoutErrorHandler]
 public function testTraceWithCSP(): void
 {
 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();

 $this->resetServices();

 /** @var App $config */
Expand All@@ -780,11 +754,6 @@ public function testTraceWithCSP(): void

 Kint::$cli_detection = false;

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 // `$app->initialize()` sets error handler.
 restore_error_handler();

 $this->expectOutputRegex('/<style class="kint-rich-style" nonce="[0-9a-z]{24}">/u');
 trace();
 }
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Config/BaseConfigTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use PHPUnit\Framework\MockObject\MockObject;
use RegistrarConfig;
use RuntimeException;
Expand All@@ -35,6 +36,7 @@ final class BaseConfigTest extends CIUnitTestCase
{
 private string $fixturesFolder;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -54,10 +56,6 @@ protected function setUp(): void
 }

 BaseConfig::reset();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Config/DotEnvTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use TypeError;

/**
Expand All@@ -34,6 +35,7 @@ final class DotEnvTest extends CIUnitTestCase
 private string $path;
 private string $fixturesFolder;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -46,10 +48,6 @@ protected function setUp(): void
 $file = 'unreadable.env';
 $path = rtrim($this->fixturesFolder, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $file;
 chmod($path, 0644);

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Config/ServicesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;
use RuntimeException;
use Tests\Support\Config\Services;

Expand All@@ -63,15 +64,12 @@ final class ServicesTest extends CIUnitTestCase
{
 private array $original;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();

 $this->original = $_SERVER;

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Events/EventsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
Expand All@@ -31,17 +32,14 @@ final class EventsTest extends CIUnitTestCase
 */
 private Events $manager;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();

 $this->manager = new MockEvents();

 Events::removeAllListeners();

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 protected function tearDown(): void
Expand Down

6 changes: 2 additions & 4 deletions
tests/system/Filters/HoneypotTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\PreserveGlobalState;
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
use PHPUnit\Framework\Attributes\WithoutErrorHandler;

/**
 * @internal
Expand All@@ -42,6 +43,7 @@ final class HoneypotTest extends CIUnitTestCase

 private ?Response $response = null;

 #[WithoutErrorHandler]
 protected function setUp(): void
 {
 parent::setUp();
Expand All@@ -51,10 +53,6 @@ protected function setUp(): void
 unset($_POST[$this->honey->name]);
 $_SERVER['REQUEST_METHOD'] = 'POST';
 $_POST[$this->honey->name] = 'hey';

 // Workaround for errors on PHPUnit 10 and PHP 8.3.
 // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
 restore_error_handler();
 }

 public function testBeforeTriggered(): void
Expand Down
Loading