Skip to content

Commit

Permalink
Merge branch '10.5' into 11.1
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastianbergmann committed Apr 14, 2024
2 parents 5b215d0 + 835df17 commit 00061dd
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
->in(__DIR__ . '/tests/end-to-end')
->in(__DIR__ . '/tests/unit')
->notName('DeprecatedPhpFeatureTest.php')
// don't mangle whitespaces in this test, which are required for the error reproduce
->notName('Issue5795Test.php')
->notName('ReadonlyClass.php')
->notName('*.phpt');

Expand Down
1 change: 1 addition & 0 deletions ChangeLog-11.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ All notable changes of the PHPUnit 11.1 release series are documented in this fi

### Fixed

* [#5795](https://github.com/sebastianbergmann/phpunit/issues/5795): Using `@testWith` annotation may generate `PHP Warning: Uninitialized string offset 0`
* [#5807](https://github.com/sebastianbergmann/phpunit/issues/5807): The `#[CoversMethod]` attribute is not considered for risky test check

## [11.1.1] - 2024-04-06
Expand Down
2 changes: 1 addition & 1 deletion src/Metadata/Api/DataProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ private function dataProvidedByTestWithAnnotation(string $className, string $met
foreach (explode("\n", $annotationContent) as $candidateRow) {
$candidateRow = trim($candidateRow);

if ($candidateRow[0] !== '[') {
if ($candidateRow === '' || $candidateRow[0] !== '[') {
break;
}

Expand Down
27 changes: 27 additions & 0 deletions tests/end-to-end/regression/5795.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
--TEST--
https://github.com/sebastianbergmann/phpunit/issues/5795
--FILE--
<?php declare(strict_types=1);
$_SERVER['argv'][] = '--do-not-cache-result';
$_SERVER['argv'][] = '--no-configuration';
$_SERVER['argv'][] = '--testdox';
$_SERVER['argv'][] = __DIR__ . '/5795/Issue5795Test.php';

require_once __DIR__ . '/../../bootstrap.php';

(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
--EXPECTF--
PHPUnit %s by Sebastian Bergmann and contributors.

Runtime: %s

... 3 / 3 (100%)

Time: %s, Memory: %s

Issue5795 (PHPUnit\TestFixture\Issue5795\Issue5795)
This test should make phpunit spit a PHP Warning ! with data set #0
This test should make phpunit spit a PHP Warning ! with data set #1
This test should make phpunit spit a PHP Warning ! with data set #2

OK (3 tests, 3 assertions)
27 changes: 27 additions & 0 deletions tests/end-to-end/regression/5795/Issue5795Test.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php declare(strict_types=1);
/*
* This file is part of PHPUnit.
*
* (c) Sebastian Bergmann <sebastian@phpunit.de>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace PHPUnit\TestFixture\Issue5795;

use PHPUnit\Framework\TestCase;

final class Issue5795Test extends TestCase
{
/**
* @testWith [1]
* [2]
* [3]
*
* @testdox This test should make phpunit spit a PHP Warning !
*/
public function testExample($arg): void
{
$this->assertIsInt($arg);
}
}

0 comments on commit 00061dd

Please sign in to comment.