reference dataprovider in more error messages

Author: staabm

src/Metadata/Api/DataProvider.php

@@ -73,8 +73,9 @@ public function providedData(string $className, string $methodName): ?array
             if (!is_array($value)) {
                 throw InvalidDataProviderException::forProvider(
                     sprintf(
-                        'Data set %s is invalid, expected array but got %s',
+                        'Data set %s provided by %s is invalid, expected array but got %s',
                         $this->formatKey($key),
+                        $providedData->getProviderLabel(),
                         get_debug_type($value),
                     ),
                     $providedData->getProviderLabel(),
@@ -96,8 +97,9 @@ public function providedData(string $className, string $methodName): ?array
                         Event\TestData\TestDataCollection::fromArray([]),
                     ),
                     sprintf(
-                        'Data set %s has more arguments (%d) than the test method accepts (%d)',
+                        'Data set %s provided by %s has more arguments (%d) than the test method accepts (%d)',
                         $this->formatKey($key),
+                        $providedData->getProviderLabel(),
                         count($value),
                         $testMethodNumberOfParameters,
                     ),

tests/end-to-end/data-provider/too-many-arguments.phpt

@@ -20,7 +20,7 @@ Time: %s, Memory: %s
 1 test triggered 1 PHPUnit warning:
 
 1) PHPUnit\TestFixture\DataProviderTooManyArgumentsTest::testMethodHavingTwoParameters
-Data set #2 has more arguments (3) than the test method accepts (2)
+Data set #2 provided by PHPUnit\TestFixture\DataProviderTooManyArgumentsTest::provider has more arguments (3) than the test method accepts (2)
 
 %s:%d
 

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

@@ -19,7 +19,7 @@ Data Provider Method Finished for PHPUnit\TestFixture\Event\InvalidDataProviderW
 - PHPUnit\TestFixture\Event\InvalidDataProviderWithOneTestPassingTest::provider
 Test Triggered PHPUnit Error (PHPUnit\TestFixture\Event\InvalidDataProviderWithOneTestPassingTest::testOne)
 The data provider PHPUnit\TestFixture\Event\InvalidDataProviderWithOneTestPassingTest::provider specified for PHPUnit\TestFixture\Event\InvalidDataProviderWithOneTestPassingTest::testOne is invalid
-Data set #0 is invalid, expected array but got int
+Data set #0 provided by PHPUnit\TestFixture\Event\InvalidDataProviderWithOneTestPassingTest::provider is invalid, expected array but got int
 Test Suite Loaded (1 test)
 Test Runner Started
 Test Suite Sorted

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

@@ -19,7 +19,7 @@ Data Provider Method Finished for PHPUnit\TestFixture\Event\InvalidDataProviderT
 - PHPUnit\TestFixture\Event\InvalidDataProviderTest::provider
 Test Triggered PHPUnit Error (PHPUnit\TestFixture\Event\InvalidDataProviderTest::testOne)
 The data provider PHPUnit\TestFixture\Event\InvalidDataProviderTest::provider specified for PHPUnit\TestFixture\Event\InvalidDataProviderTest::testOne is invalid
-Data set #0 is invalid, expected array but got int
+Data set #0 provided by PHPUnit\TestFixture\Event\InvalidDataProviderTest::provider is invalid, expected array but got int
 Test Runner Triggered Warning (No tests found in class "PHPUnit\TestFixture\Event\InvalidDataProviderTest".)
 Test Suite Loaded (0 tests)
 Test Runner Started

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

@@ -19,13 +19,13 @@ There were 2 PHPUnit errors:
 
 1) PHPUnit\TestFixture\Issue2137Test::testBrandService
 The data provider PHPUnit\TestFixture\Issue2137Test::provideBrandService specified for PHPUnit\TestFixture\Issue2137Test::testBrandService is invalid
-Data set #0 is invalid, expected array but got stdClass
+Data set #0 provided by PHPUnit\TestFixture\Issue2137Test::provideBrandService is invalid, expected array but got stdClass
 
 %s:%d
 
 2) PHPUnit\TestFixture\Issue2137Test::testSomethingElseInvalid
 The data provider PHPUnit\TestFixture\Issue2137Test::provideBrandService specified for PHPUnit\TestFixture\Issue2137Test::testSomethingElseInvalid is invalid
-Data set #0 is invalid, expected array but got stdClass
+Data set #0 provided by PHPUnit\TestFixture\Issue2137Test::provideBrandService is invalid, expected array but got stdClass
 
 %s:%d
 

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

@@ -17,13 +17,13 @@ There were 2 PHPUnit errors:
 
 1) PHPUnit\TestFixture\Issue2137Test::testBrandService
 The data provider PHPUnit\TestFixture\Issue2137Test::provideBrandService specified for PHPUnit\TestFixture\Issue2137Test::testBrandService is invalid
-Data set #0 is invalid, expected array but got stdClass
+Data set #0 provided by PHPUnit\TestFixture\Issue2137Test::provideBrandService is invalid, expected array but got stdClass
 
 %s:%d
 
 2) PHPUnit\TestFixture\Issue2137Test::testSomethingElseInvalid
 The data provider PHPUnit\TestFixture\Issue2137Test::provideBrandService specified for PHPUnit\TestFixture\Issue2137Test::testSomethingElseInvalid is invalid
-Data set #0 is invalid, expected array but got stdClass
+Data set #0 provided by PHPUnit\TestFixture\Issue2137Test::provideBrandService is invalid, expected array but got stdClass
 
 %s:%d