Merge branch '8.3'

sebastianbergmann · Sep 7, 2019 · c58638b · c58638b
2 parents 77d2c9b + 4713ace
commit c58638b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/Framework/DataProviderTestSuite.php b/src/Framework/DataProviderTestSuite.php
@@ -29,6 +29,10 @@ public function setDependencies(array $dependencies): void
         $this->dependencies = $dependencies;
 
         foreach ($this->tests as $test) {
+            if (!$test instanceof TestCase) {
+                continue;
+            }
+
             $test->setDependencies($dependencies);
         }
     }

diff --git a/src/Framework/TestSuite.php b/src/Framework/TestSuite.php
@@ -56,7 +56,7 @@ class TestSuite implements \IteratorAggregate, SelfDescribing, Test
     /**
      * The tests in the test suite.
      *
-     * @var TestCase[]
+     * @var Test[]
      */
     protected $tests = [];
 

diff --git a/src/Runner/TestSuiteSorter.php b/src/Runner/TestSuiteSorter.php
@@ -202,7 +202,10 @@ private function sort(TestSuite $suite, int $order, bool $resolveDependencies, i
         }
 
         if ($resolveDependencies && !($suite instanceof DataProviderTestSuite) && $this->suiteOnlyContainsTests($suite)) {
-            $suite->setTests($this->resolveDependencies($suite->tests()));
+            /** @var TestCase[] $tests */
+            $tests = $suite->tests();
+
+            $suite->setTests($this->resolveDependencies($tests));
         }
     }