Skip to content

Commit 55be771

Browse files
committed
Updated phpunit config + fixed phpstan errors
1 parent 8caab8a commit 55be771

File tree

5 files changed

+23
-36
lines changed

5 files changed

+23
-36
lines changed

phpunit.xml

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,17 @@
11
<?xml version="1.0"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
4-
backupGlobals="true"
5-
colors="false"
6-
processIsolation="false"
7-
stopOnError="false"
8-
stopOnFailure="false"
9-
stopOnIncomplete="false"
10-
stopOnSkipped="false"
11-
stopOnRisky="false"
12-
timeoutForSmallTests="1"
13-
timeoutForMediumTests="10"
14-
timeoutForLargeTests="60"
15-
cacheDirectory=".phpunit.cache"
16-
>
17-
<testsuites>
18-
<testsuite name="Functional tests">
19-
<directory>tests/functional/</directory>
20-
</testsuite>
21-
</testsuites>
22-
<coverage>
23-
<include>
24-
<directory suffix=".php">src</directory>
25-
</include>
26-
</coverage>
27-
<php>
28-
<ini name="allow_url_include" value="1"/>
29-
</php>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd" backupGlobals="true" colors="false" processIsolation="false" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" stopOnRisky="false" timeoutForSmallTests="1" timeoutForMediumTests="10" timeoutForLargeTests="60" cacheDirectory=".phpunit.cache">
3+
<testsuites>
4+
<testsuite name="Functional tests">
5+
<directory>tests/functional/</directory>
6+
</testsuite>
7+
</testsuites>
8+
<coverage/>
9+
<php>
10+
<ini name="allow_url_include" value="1"/>
11+
</php>
12+
<source>
13+
<include>
14+
<directory suffix=".php">src</directory>
15+
</include>
16+
</source>
3017
</phpunit>

src/CSV/FingersCrossed/Loader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function __construct(
2626

2727
public function load(): \Generator
2828
{
29-
$line = yield;
29+
$line = yield new EmptyResultBucket();
3030
try {
3131
$this->writer->addRow(
3232
new Row(array_map(fn ($value) => new Cell($value), array_keys($line)), null)
@@ -37,7 +37,7 @@ public function load(): \Generator
3737
return;
3838
}
3939

40-
while (true) {
40+
while ($line) {
4141
try {
4242
$this->writer->addRow(
4343
new Row(array_map(fn ($value) => new Cell($value), $line), null)

src/CSV/Safe/Loader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function __construct(
2626

2727
public function load(): \Generator
2828
{
29-
$line = yield;
29+
$line = yield new EmptyResultBucket();
3030
$headers = array_keys($line);
3131
try {
3232
$this->writer->addRow(
@@ -38,7 +38,7 @@ public function load(): \Generator
3838
return;
3939
}
4040

41-
while (true) {
41+
while ($line) {
4242
try {
4343
$this->writer->addRow($this->orderColumns($headers, $line));
4444
} catch (IOException|WriterNotOpenedException $exception) {

src/Sheet/FingersCrossed/Loader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function __construct(
3030

3131
public function load(): \Generator
3232
{
33-
$line = yield;
33+
$line = yield new EmptyResultBucket();
3434

3535
try {
3636
$this->writer->addRow(
@@ -42,7 +42,7 @@ public function load(): \Generator
4242
return;
4343
}
4444

45-
while (true) {
45+
while ($line) {
4646
try {
4747
$this->writer->addRow(
4848
new Row(array_map(fn ($value) => new Cell($value), $line), null)

src/Sheet/Safe/Loader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function __construct(
3030

3131
public function load(): \Generator
3232
{
33-
$line = yield;
33+
$line = yield new EmptyResultBucket();
3434
$headers = array_keys($line);
3535
try {
3636
$this->writer->addRow(
@@ -42,7 +42,7 @@ public function load(): \Generator
4242
return;
4343
}
4444

45-
while (true) {
45+
while ($line) {
4646
try {
4747
$this->writer->addRow($this->orderColumns($headers, $line));
4848
} catch (IOException|WriterNotOpenedException $exception) {

0 commit comments

Comments
 (0)