Skip to content

Commit 14d6a11

Browse files
Rename
1 parent 7bef8ad commit 14d6a11

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

.psalm/baseline.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1014,7 +1014,7 @@
10141014
<code>new StandardTestSuiteLoader</code>
10151015
<code>new XdebugFilterScriptGenerator</code>
10161016
</DeprecatedClass>
1017-
<DeprecatedMethod occurrences="9">
1017+
<DeprecatedMethod occurrences="10">
10181018
<code>addListener</code>
10191019
<code>addListener</code>
10201020
<code>addListener</code>
@@ -1023,6 +1023,7 @@
10231023
<code>addListener</code>
10241024
<code>addListener</code>
10251025
<code>addListener</code>
1026+
<code>createLegacyInstance</code>
10261027
<code>flushListeners</code>
10271028
</DeprecatedMethod>
10281029
<DocblockTypeContradiction occurrences="2">

src/Runner/Extension/ExtensionHandler.php

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
*/
2424
final class ExtensionHandler
2525
{
26-
public function createHookInstance(Extension $extension): Hook
26+
public function createInstance(Extension $extension): Hook
2727
{
28-
$object = $this->createInstance($extension);
28+
$object = $this->doCreateInstance($extension);
2929

3030
if (!$object instanceof Hook) {
3131
throw new Exception(
@@ -39,9 +39,12 @@ public function createHookInstance(Extension $extension): Hook
3939
return $object;
4040
}
4141

42-
public function createTestListenerInstance(Extension $extension): TestListener
42+
/**
43+
* @deprecated
44+
*/
45+
public function createLegacyInstance(Extension $extension): TestListener
4346
{
44-
$object = $this->createInstance($extension);
47+
$object = $this->doCreateInstance($extension);
4548

4649
if (!$object instanceof TestListener) {
4750
throw new Exception(
@@ -55,7 +58,7 @@ public function createTestListenerInstance(Extension $extension): TestListener
5558
return $object;
5659
}
5760

58-
private function createInstance(Extension $extension): object
61+
private function doCreateInstance(Extension $extension): object
5962
{
6063
$this->ensureClassExists($extension);
6164

src/TextUI/TestRunner.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,11 +1021,11 @@ private function handleConfiguration(array &$arguments): void
10211021
$extensionHandler = new ExtensionHandler;
10221022

10231023
foreach ($arguments['configurationObject']->extensions() as $extension) {
1024-
$this->addExtension($extensionHandler->createHookInstance($extension));
1024+
$this->addExtension($extensionHandler->createInstance($extension));
10251025
}
10261026

10271027
foreach ($arguments['configurationObject']->listeners() as $listener) {
1028-
$arguments['listeners'][] = $extensionHandler->createTestListenerInstance($listener);
1028+
$arguments['listeners'][] = $extensionHandler->createLegacyInstance($listener);
10291029
}
10301030

10311031
unset($extensionHandler);
@@ -1082,7 +1082,7 @@ private function handleConfiguration(array &$arguments): void
10821082
$extensionHandler = new ExtensionHandler;
10831083

10841084
foreach ($arguments['extensions'] as $extension) {
1085-
$this->addExtension($extensionHandler->createHookInstance($extension));
1085+
$this->addExtension($extensionHandler->createInstance($extension));
10861086
}
10871087

10881088
unset($extensionHandler);

0 commit comments

Comments
 (0)