Codeception
diff --git a/‎composer.json
Lines changed: 1 addition & 1 deletion b/‎composer.json
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Codeception/Step.php
Lines changed: 18 additions & 2 deletions b/‎src/Codeception/Step.php
Lines changed: 18 additions & 2 deletions
diff --git a/‎tests/data/DummyOverloadableClass.php
Lines changed: 3 additions & 7 deletions b/‎tests/data/DummyOverloadableClass.php
Lines changed: 3 additions & 7 deletions
diff --git a/‎tests/unit/Codeception/StepTest.php
Lines changed: 1 addition & 2 deletions b/‎tests/unit/Codeception/StepTest.php
Lines changed: 1 addition & 2 deletions
@@ -21,7 +21,7 @@
         "ext-mbstring": "*",
         "behat/gherkin": "^4.6.2",
         "codeception/lib-asserts": "2.0.*@dev",
-        "codeception/stub": "^3.7 | ^4.0",
+        "codeception/stub": "^4.1",
         "phpunit/phpunit": "^9.5",
         "phpunit/php-code-coverage": "^9.2",
         "phpunit/php-text-template": "^2.0",
 
@@ -185,8 +185,24 @@ protected function getClassName(object $argument): string
     {
         if ($argument instanceof Closure) {
             return Closure::class;
-        } elseif ($argument instanceof MockObject && (property_exists($argument, '__mocked') && $argument->__mocked !== null)) {
-            return $this->formatClassName($argument->__mocked);
+        } elseif ($argument instanceof MockObject) {
+            $parentClass = get_parent_class($argument);
+            $reflection = new \ReflectionClass($argument);
+
+            if ($parentClass !== false) {
+                return $this->formatClassName($parentClass);
+            }
+
+            $interfaces = $reflection->getInterfaceNames();
+            foreach ($interfaces as $interface) {
+                if (str_starts_with($interface, 'PHPUnit\\')) {
+                    continue;
+                }
+                if (str_starts_with($interface, 'Codeception\\')) {
+                    continue;
+                }
+                return $this->formatClassName($interface);
+            }
         }
 
         return $this->formatClassName($argument::class);
 
@@ -57,15 +57,11 @@ public function exceptionalMethod(): void
 
     public function __get($name)
     {
-        //seeing as we're not implementing __set here, add check for __mocked
-        $return = null;
-        if ($name === '__mocked') {
-            $return = $this->__mocked ?? null;
-        } elseif ($this->__isset($name)) {
-            $return = $this->properties[$name];
+        if ($this->__isset($name)) {
+            return $this->properties[$name];
         }
 
-        return $return;
+        return null;
     }
 
     public function __isset($name)
 
@@ -43,8 +43,7 @@ public function testGetArguments()
 
         $mock = $this->createMock($this::class);
         $step = $this->getStep(['', [[$mock, 'testGetArguments']]]);
-        $className = $mock::class;
-        $this->assertSame('["' . $className . '","testGetArguments"]', $step->getArgumentsAsString());
+        $this->assertSame('["StepTest","testGetArguments"]', $step->getArgumentsAsString());
     }
 
     public function testGetHtml()
Original file line number	Diff line number	Diff line change
`@@ -57,15 +57,11 @@ public function exceptionalMethod(): void`
`57`	`57`
`58`	`58`	`public function __get($name)`
`59`	`59`	`{`
`60`		`- //seeing as we're not implementing __set here, add check for __mocked`
`61`		`- $return = null;`
`62`		`- if ($name === '__mocked') {`
`63`		`- $return = $this->__mocked ?? null;`
`64`		`- } elseif ($this->__isset($name)) {`
`65`		`- $return = $this->properties[$name];`
	`60`	`+ if ($this->__isset($name)) {`
	`61`	`+ return $this->properties[$name];`
`66`	`62`	`}`
`67`	`63`
`68`		`- return $return;`
	`64`	`+ return null;`
`69`	`65`	`}`
`70`	`66`
`71`	`67`	`public function __isset($name)`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,7 @@ public function testGetArguments()`
`43`	`43`
`44`	`44`	`$mock = $this->createMock($this::class);`
`45`	`45`	`$step = $this->getStep(['', [[$mock, 'testGetArguments']]]);`
`46`		`- $className = $mock::class;`
`47`		`- $this->assertSame('["' . $className . '","testGetArguments"]', $step->getArgumentsAsString());`
	`46`	`+ $this->assertSame('["StepTest","testGetArguments"]', $step->getArgumentsAsString());`
`48`	`47`	`}`
`49`	`48`
`50`	`49`	`public function testGetHtml()`