Merge branch '8.5' into 9.3

sebastianbergmann · Sep 27, 2020 · b03b938 · b03b938
2 parents b77f2da + 155e5b0
commit b03b938
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 19 deletions.
diff --git a/src/Framework/TestSuite.php b/src/Framework/TestSuite.php
@@ -228,6 +228,10 @@ public function __construct($theClass = '', string $name = '')
                 continue;
             }
 
+            if (!TestUtil::isTestMethod($method)) {
+                continue;
+            }
+
             $this->addTestMethod($theClass, $method);
         }
 
@@ -866,26 +870,8 @@ protected function createResult(): TestResult
      */
     protected function addTestMethod(ReflectionClass $class, ReflectionMethod $method): void
     {
-        if (!TestUtil::isTestMethod($method)) {
-            return;
-        }
-
         $methodName = $method->getName();
 
-        if (!$method->isPublic()) {
-            $this->addTest(
-                new WarningTestCase(
-                    sprintf(
-                        'Test method "%s" in test class "%s" is not public.',
-                        $methodName,
-                        $class->getName()
-                    )
-                )
-            );
-
-            return;
-        }
-
         $test = (new TestBuilder)->build($class, $methodName);
 
         if ($test instanceof TestCase || $test instanceof DataProviderTestSuite) {

diff --git a/src/Util/Test.php b/src/Util/Test.php
@@ -560,6 +560,10 @@ public static function getHookMethods(string $className): array
 
     public static function isTestMethod(ReflectionMethod $method): bool
     {
+        if (!$method->isPublic()) {
+            return false;
+        }
+
         if (strpos($method->getName(), 'test') === 0) {
             return true;
         }

diff --git a/tests/unit/Framework/TestSuiteTest.php b/tests/unit/Framework/TestSuiteTest.php
@@ -103,7 +103,7 @@ public function testNotPublicTestCase(): void
     {
         $suite = new TestSuite(NotPublicTestCase::class);
 
-        $this->assertCount(2, $suite);
+        $this->assertCount(1, $suite);
     }
 
     public function testNotVoidTestCase(): void