Skip to content

Commit a7a7de5

Browse files
staabmsebastianbergmann
staabm
authored and
sebastianbergmann
committed
partly revert to de-duplicate error information
1 parent 870a465 commit a7a7de5

File tree

6 files changed

+14
-21
lines changed

6 files changed

+14
-21
lines changed

‎src/Metadata/Api/DataProvider.php

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,13 @@ public function providedData(string $className, string $methodName): ?array
7171
$value = $providedData->getData();
7272

7373
if (!is_array($value)) {
74-
throw InvalidDataProviderException::forProvider(
74+
throw new InvalidDataProviderException(
7575
sprintf(
7676
'Data set %s provided by %s is invalid, expected array but got %s',
7777
$this->formatKey($key),
7878
$providedData->getProviderLabel(),
7979
get_debug_type($value),
8080
),
81-
$providedData->getProviderLabel(),
8281
);
8382
}
8483

@@ -141,35 +140,32 @@ private function dataProvidedByMethods(string $className, string $methodName, Me
141140
$method = new ReflectionMethod($_dataProvider->className(), $_dataProvider->methodName());
142141

143142
if (!$method->isPublic()) {
144-
throw InvalidDataProviderException::forProvider(
143+
throw new InvalidDataProviderException(
145144
sprintf(
146145
'Data Provider method %s::%s() is not public',
147146
$_dataProvider->className(),
148147
$_dataProvider->methodName(),
149148
),
150-
$providerLabel,
151149
);
152150
}
153151

154152
if (!$method->isStatic()) {
155-
throw InvalidDataProviderException::forProvider(
153+
throw new InvalidDataProviderException(
156154
sprintf(
157155
'Data Provider method %s::%s() is not static',
158156
$_dataProvider->className(),
159157
$_dataProvider->methodName(),
160158
),
161-
$providerLabel,
162159
);
163160
}
164161

165162
if ($method->getNumberOfParameters() > 0) {
166-
throw InvalidDataProviderException::forProvider(
163+
throw new InvalidDataProviderException(
167164
sprintf(
168165
'Data Provider method %s::%s() expects an argument',
169166
$_dataProvider->className(),
170167
$_dataProvider->methodName(),
171168
),
172-
$providerLabel,
173169
);
174170
}
175171

@@ -197,25 +193,23 @@ private function dataProvidedByMethods(string $className, string $methodName, Me
197193
...$methodsCalled,
198194
);
199195

200-
throw InvalidDataProviderException::forProvider(
196+
throw new InvalidDataProviderException(
201197
sprintf(
202198
'The key "%s" has already been defined by provider %s',
203199
$key,
204200
$result[$key]->getProviderLabel(),
205201
),
206-
$providerLabel,
207202
);
208203
}
209204

210205
$result[$key] = new ProvidedData($providerLabel, $value);
211206
} else {
212207
// @codeCoverageIgnoreStart
213-
throw InvalidDataProviderException::forProvider(
208+
throw new InvalidDataProviderException(
214209
sprintf(
215210
'The key must be an integer or a string, %s given',
216211
get_debug_type($key),
217212
),
218-
$providerLabel,
219213
);
220214
// @codeCoverageIgnoreEnd
221215
}
@@ -246,12 +240,11 @@ private function dataProvidedByMetadata(MetadataCollection $testWith): array
246240
$key = $_testWith->name();
247241

248242
if (array_key_exists($key, $result)) {
249-
throw InvalidDataProviderException::forProvider(
243+
throw new InvalidDataProviderException(
250244
sprintf(
251245
'The key "%s" has already been defined by a previous TestWith attribute',
252246
$key,
253247
),
254-
$providerLabel,
255248
);
256249
}
257250

‎tests/end-to-end/event/data-provider-duplicate-key.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Data Provider Method Called (PHPUnit\TestFixture\Event\DataProviderDuplicateKeyT
1818
Data Provider Method Finished for PHPUnit\TestFixture\Event\DataProviderDuplicateKeyTest::testSomething:
1919
- PHPUnit\TestFixture\Event\DataProviderDuplicateKeyTest::provider
2020
Test Triggered PHPUnit Error (PHPUnit\TestFixture\Event\DataProviderDuplicateKeyTest::testSomething)
21-
The data provider PHPUnit\TestFixture\Event\DataProviderDuplicateKeyTest::provider specified for PHPUnit\TestFixture\Event\DataProviderDuplicateKeyTest::testSomething is invalid
21+
The data provider specified for PHPUnit\TestFixture\Event\DataProviderDuplicateKeyTest::testSomething is invalid
2222
The key "key" has already been defined by provider PHPUnit\TestFixture\Event\DataProviderDuplicateKeyTest::provider
2323
Test Runner Triggered Warning (No tests found in class "PHPUnit\TestFixture\Event\DataProviderDuplicateKeyTest".)
2424
Test Suite Loaded (0 tests)

‎tests/end-to-end/event/invalid-data-provider-with-passing-test.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Data Provider Method Called (PHPUnit\TestFixture\Event\InvalidDataProviderWithOn
1818
Data Provider Method Finished for PHPUnit\TestFixture\Event\InvalidDataProviderWithOneTestPassingTest::testOne:
1919
- PHPUnit\TestFixture\Event\InvalidDataProviderWithOneTestPassingTest::provider
2020
Test Triggered PHPUnit Error (PHPUnit\TestFixture\Event\InvalidDataProviderWithOneTestPassingTest::testOne)
21-
The data provider PHPUnit\TestFixture\Event\InvalidDataProviderWithOneTestPassingTest::provider specified for PHPUnit\TestFixture\Event\InvalidDataProviderWithOneTestPassingTest::testOne is invalid
21+
The data provider specified for PHPUnit\TestFixture\Event\InvalidDataProviderWithOneTestPassingTest::testOne is invalid
2222
Data set #0 provided by PHPUnit\TestFixture\Event\InvalidDataProviderWithOneTestPassingTest::provider is invalid, expected array but got int
2323
Test Suite Loaded (1 test)
2424
Test Runner Started

‎tests/end-to-end/event/invalid-data-provider.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Data Provider Method Called (PHPUnit\TestFixture\Event\InvalidDataProviderTest::
1818
Data Provider Method Finished for PHPUnit\TestFixture\Event\InvalidDataProviderTest::testOne:
1919
- PHPUnit\TestFixture\Event\InvalidDataProviderTest::provider
2020
Test Triggered PHPUnit Error (PHPUnit\TestFixture\Event\InvalidDataProviderTest::testOne)
21-
The data provider PHPUnit\TestFixture\Event\InvalidDataProviderTest::provider specified for PHPUnit\TestFixture\Event\InvalidDataProviderTest::testOne is invalid
21+
The data provider specified for PHPUnit\TestFixture\Event\InvalidDataProviderTest::testOne is invalid
2222
Data set #0 provided by PHPUnit\TestFixture\Event\InvalidDataProviderTest::provider is invalid, expected array but got int
2323
Test Runner Triggered Warning (No tests found in class "PHPUnit\TestFixture\Event\InvalidDataProviderTest".)
2424
Test Suite Loaded (0 tests)

‎tests/end-to-end/regression/2137-filter.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ Runtime: %s
1818
There were 2 PHPUnit errors:
1919

2020
1) PHPUnit\TestFixture\Issue2137Test::testBrandService
21-
The data provider PHPUnit\TestFixture\Issue2137Test::provideBrandService specified for PHPUnit\TestFixture\Issue2137Test::testBrandService is invalid
21+
The data provider specified for PHPUnit\TestFixture\Issue2137Test::testBrandService is invalid
2222
Data set #0 provided by PHPUnit\TestFixture\Issue2137Test::provideBrandService is invalid, expected array but got stdClass
2323

2424
%s:%d
2525

2626
2) PHPUnit\TestFixture\Issue2137Test::testSomethingElseInvalid
27-
The data provider PHPUnit\TestFixture\Issue2137Test::provideBrandService specified for PHPUnit\TestFixture\Issue2137Test::testSomethingElseInvalid is invalid
27+
The data provider specified for PHPUnit\TestFixture\Issue2137Test::testSomethingElseInvalid is invalid
2828
Data set #0 provided by PHPUnit\TestFixture\Issue2137Test::provideBrandService is invalid, expected array but got stdClass
2929

3030
%s:%d

‎tests/end-to-end/regression/2137-no_filter.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ Runtime: %s
1616
There were 2 PHPUnit errors:
1717

1818
1) PHPUnit\TestFixture\Issue2137Test::testBrandService
19-
The data provider PHPUnit\TestFixture\Issue2137Test::provideBrandService specified for PHPUnit\TestFixture\Issue2137Test::testBrandService is invalid
19+
The data provider specified for PHPUnit\TestFixture\Issue2137Test::testBrandService is invalid
2020
Data set #0 provided by PHPUnit\TestFixture\Issue2137Test::provideBrandService is invalid, expected array but got stdClass
2121

2222
%s:%d
2323

2424
2) PHPUnit\TestFixture\Issue2137Test::testSomethingElseInvalid
25-
The data provider PHPUnit\TestFixture\Issue2137Test::provideBrandService specified for PHPUnit\TestFixture\Issue2137Test::testSomethingElseInvalid is invalid
25+
The data provider specified for PHPUnit\TestFixture\Issue2137Test::testSomethingElseInvalid is invalid
2626
Data set #0 provided by PHPUnit\TestFixture\Issue2137Test::provideBrandService is invalid, expected array but got stdClass
2727

2828
%s:%d

0 commit comments

Comments
 (0)