From 899d4d08a123ecb9b92e7073289a3c71d37c57ae Mon Sep 17 00:00:00 2001
From: Florian Engelhardt <florian.engelhardt@oxid-esales.com>
Date: Wed, 19 Feb 2020 16:13:14 +0100
Subject: [PATCH] Fix psalm violations

---
 src/Framework/TestSuite.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Framework/TestSuite.php b/src/Framework/TestSuite.php
index 184b7edbfac..4f30cd0983e 100644
--- a/src/Framework/TestSuite.php
+++ b/src/Framework/TestSuite.php
@@ -448,12 +448,15 @@ public function addTestFile(string $filename): void
                         $this->addTest($method->invoke(null, $className));
                     }
                 } elseif ($class->implementsInterface(Test::class)) {
-                    $classFileName     = \basename($class->getFilename());
-                    $expectedClassName = \substr(
-                        $classFileName,
-                        0,
-                        \strpos($classFileName, '.')
-                    );
+                    $expectedClassName = $shortName;
+
+                    if (($pos = \strpos($expectedClassName, '.')) !== false) {
+                        $expectedClassName = \substr(
+                            $expectedClassName,
+                            0,
+                            $pos
+                        );
+                    }
 
                     if ($class->getShortName() !== $expectedClassName) {
                         $this->addWarning(