Merge branch '7.5' into 8.3

sebastianbergmann · Sep 9, 2019 · 4d9527d · 4d9527d
2 parents efb58e3 + d434b33
commit 4d9527d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Util/Log/TeamCity.php b/src/Util/Log/TeamCity.php
@@ -203,7 +203,7 @@ public function startTestSuite(TestSuite $suite): void
  } else {
  $split = \explode('::', $suiteName);
 
- if (\count($split) === 2 && \method_exists($split[0], $split[1])) {
+ if (\count($split) === 2 && \class_exists($split[0]) && \method_exists($split[0], $split[1])) {
  $fileName = self::getFileName($split[0]);
  $parameters['locationHint'] = "php_qn://$fileName::\\$suiteName";
  $parameters['name'] = $split[1];
@@ -229,7 +229,7 @@ public function endTestSuite(TestSuite $suite): void
  if (!\class_exists($suiteName, false)) {
  $split = \explode('::', $suiteName);
 
- if (\count($split) === 2 && \method_exists($split[0], $split[1])) {
+ if (\count($split) === 2 && \class_exists($split[0]) && \method_exists($split[0], $split[1])) {
  $parameters['name'] = $split[1];
  }
  }

diff --git a/src/Util/Test.php b/src/Util/Test.php
@@ -355,7 +355,7 @@ public static function getMissingRequirements(string $className, string $methodN
  foreach ($required['functions'] as $function) {
  $pieces = \explode('::', $function);
 
- if (\count($pieces) === 2 && \method_exists($pieces[0], $pieces[1])) {
+ if (\count($pieces) === 2 && \class_exists($pieces[0]) && \method_exists($pieces[0], $pieces[1])) {
  continue;
  }