Skip to content

Commit 9396750

Browse files
alecrabbitalecrabbit
committed
~
1 parent 2b5ae51 commit 9396750

22 files changed

+69
-56
lines changed

‎src/Spinner/Core/Config/Solver/AutoStartModeSolver.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ private function doSolve(
4545
AutoStartOption::ENABLED,
4646
AutoStartOption::ENABLED,
4747
],
48+
[
49+
AutoStartOption::ENABLED,
50+
null,
51+
AutoStartOption::ENABLED,
52+
],
4853
[
4954
AutoStartOption::ENABLED,
5055
AutoStartOption::DISABLED,
@@ -100,6 +105,11 @@ private function doSolve(
100105
AutoStartOption::ENABLED,
101106
AutoStartOption::ENABLED,
102107
],
108+
[
109+
AutoStartOption::DISABLED,
110+
null,
111+
AutoStartOption::ENABLED,
112+
],
103113
[
104114
AutoStartOption::AUTO,
105115
AutoStartOption::DISABLED,

‎src/Spinner/Core/Config/Solver/CursorVisibilityModeSolver.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@ private function doSolve(
7575
CursorVisibilityOption::VISIBLE,
7676
CursorVisibilityOption::VISIBLE,
7777
],
78+
[
79+
CursorVisibilityOption::VISIBLE,
80+
null,
81+
CursorVisibilityOption::HIDDEN,
82+
],
7883
[
7984
CursorVisibilityOption::VISIBLE,
8085
null,

‎src/Spinner/Core/Config/Solver/LinkerModeSolver.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ private function doSolve(
4444
LinkerOption::ENABLED,
4545
LinkerOption::ENABLED,
4646
],
47+
[
48+
LinkerOption::ENABLED,
49+
null,
50+
LinkerOption::ENABLED,
51+
],
4752
[
4853
LinkerOption::ENABLED,
4954
LinkerOption::DISABLED,
@@ -119,6 +124,11 @@ private function doSolve(
119124
LinkerOption::DISABLED,
120125
LinkerOption::DISABLED,
121126
],
127+
[
128+
LinkerOption::DISABLED,
129+
null,
130+
LinkerOption::ENABLED,
131+
],
122132
[
123133
null,
124134
LinkerOption::DISABLED,

‎tests/Spinner/Functional/Complex/Config/AutoStartModeConfigTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@
1414

1515
final class AutoStartModeConfigTest extends ConfigurationTestCase
1616
{
17-
protected static function performContainerModifications(): void
18-
{
19-
// do nothing
20-
}
21-
2217
#[Test]
2318
public function canSetLoopAutoStartOptionEnabled(): void
2419
{

‎tests/Spinner/Functional/Complex/Config/CursorVisibilityModeConfigTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414

1515
final class CursorVisibilityModeConfigTest extends ConfigurationTestCase
1616
{
17-
protected static function performContainerModifications(): void
18-
{
19-
// do nothing
20-
}
17+
2118

2219
#[Test]
2320
public function canSetCursorVisibilityOptionVisible(): void

‎tests/Spinner/Functional/Complex/Config/DriverMessagesConfigTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ final class DriverMessagesConfigTest extends ConfigurationTestCase
1818
{
1919
const DEFAULT_MESSAGE = '';
2020

21-
protected static function performContainerModifications(): void
21+
protected static function setTestContainer(): void
2222
{
2323
self::setContainer(
2424
self::modifyContainer(

‎tests/Spinner/Functional/Complex/Config/DriverModeConfigTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414

1515
final class DriverModeConfigTest extends ConfigurationTestCase
1616
{
17-
protected static function performContainerModifications(): void
18-
{
19-
// do nothing
20-
}
17+
2118

2219
#[Test]
2320
public function canSetDriverOptionEnabled(): void

‎tests/Spinner/Functional/Complex/Config/ForcedSynchronousModeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
final class ForcedSynchronousModeTest extends ConfigurationTestCase
2222
{
23-
protected static function performContainerModifications(): void
23+
protected static function setTestContainer(): void
2424
{
2525
self::modifyContainer(
2626
self::extractContainer(),

‎tests/Spinner/Functional/Complex/Config/LinkerModeConfigTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414

1515
final class LinkerModeConfigTest extends ConfigurationTestCase
1616
{
17-
protected static function performContainerModifications(): void
18-
{
19-
// do nothing
20-
}
17+
2118

2219
#[Test]
2320
public function canSetLinkerOptionEnabled(): void

‎tests/Spinner/Functional/Complex/Config/NormalizerModeConfigTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
final class NormalizerModeConfigTest extends ConfigurationTestCase
1919
{
20-
protected static function performContainerModifications(): void
20+
protected static function setTestContainer(): void
2121
{
2222
self::setContainer(
2323
self::modifyContainer(

‎tests/Spinner/Functional/Complex/Config/RunMethodModeConfigForcedTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
final class RunMethodModeConfigForcedTest extends ConfigurationTestCase
2020
{
21-
protected static function performContainerModifications(): void
21+
protected static function setTestContainer(): void
2222
{
2323
self::modifyContainer(
2424
self::extractContainer(),

‎tests/Spinner/Functional/Complex/Config/RunMethodModeConfigTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
final class RunMethodModeConfigTest extends ConfigurationTestCase
1919
{
20-
protected static function performContainerModifications(): void
20+
protected static function setTestContainer(): void
2121
{
2222
self::modifyContainer(
2323
self::extractContainer(),

‎tests/Spinner/Functional/Complex/Config/SignalHandlersContainerConfigTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
final class SignalHandlersContainerConfigTest extends ConfigurationTestCase
2222
{
23-
protected static function performContainerModifications(): void
23+
protected static function setTestContainer(): void
2424
{
2525
self::setContainer(
2626
self::modifyContainer(

‎tests/Spinner/Functional/Complex/Config/SignalHandlingModeConfigTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
final class SignalHandlingModeConfigTest extends ConfigurationTestCase
1919
{
20-
protected static function performContainerModifications(): void
20+
protected static function setTestContainer(): void
2121
{
2222
self::modifyContainer(
2323
self::extractContainer(),

‎tests/Spinner/Functional/Complex/Config/StylingMethodModeConfigTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
final class StylingMethodModeConfigTest extends ConfigurationTestCase
1919
{
20-
protected static function performContainerModifications(): void
20+
protected static function setTestContainer(): void
2121
{
2222
self::setContainer(
2323
self::modifyContainer(

‎tests/Spinner/Functional/Complex/Config/WidgetConfigTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
final class WidgetConfigTest extends ConfigurationTestCase
2121
{
22-
protected static function performContainerModifications(): void
22+
protected static function setTestContainer(): void
2323
{
2424
self::setContainer(
2525
self::modifyContainer(

‎tests/Spinner/Unit/Core/Config/Solver/AutoStartModeSolverTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ public static function canSolveDataProvider(): iterable
104104
[[$mD], [$oDi, $oEn, $oEn],],
105105

106106
[[$mD], [$oDi, $oDi, $oEn],], // #27
107+
[[$mE], [$oEn, null, $oEn],], // #28
108+
[[$mD], [$oDi, null, $oEn],], // #29
107109
];
108110
}
109111

‎tests/Spinner/Unit/Core/Config/Solver/CursorVisibilityModeSolverTest.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,11 @@ public static function canSolveDataProvider(): iterable
9696
[[$mH], [null, null, $oHi],],
9797
[[$mV], [null, null, $oVi],],
9898

99-
[[$mH], [$oAu, $oAu, $oHi],],
99+
[[$mH], [$oAu, $oAu, $oHi],], // #22
100100

101-
[[$mV], [$oVi, $oAu, $oHi],],
101+
[[$mV], [$oVi, $oAu, $oHi],], // #23
102+
103+
[[$mV], [$oVi, null, $oHi],], // #24
102104
];
103105
}
104106

‎tests/Spinner/Unit/Core/Config/Solver/LinkerModeSolverTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@ public static function canSolveDataProvider(): iterable
103103

104104
[[$mD], [$oDi, $oEn, $oEn],], // #25
105105
[[$mE], [$oEn, $oEn, $oEn],], // #26
106+
107+
[[$mE], [$oEn, null, $oEn],], // #27
108+
[[$mD], [$oDi, null, $oEn],], // #28
106109
];
107110
}
108111

‎tests/TestCase/ConfigurationTestCase.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,4 @@ protected static function getRequiredConfig(string $class): IConfigElement
1717
}
1818
throw new RuntimeException('Unable to get required config: ' . $class);
1919
}
20-
21-
protected function setUp(): void
22-
{
23-
parent::setUp();
24-
static::performContainerModifications();
25-
}
26-
27-
abstract protected static function performContainerModifications(): void;
2820
}

‎tests/TestCase/ContainerModifyingTestCase.php

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ abstract class ContainerModifyingTestCase extends FacadeAwareTestCase
1919
{
2020
private const DEFINITIONS = 'definitions';
2121

22-
protected function setUp(): void
22+
protected static function setTestContainer(): void
2323
{
24-
parent::setUp();
2524
$modifiedContainer = self::modifyContainer(clone self::getStoredContainer());
2625
self::setContainer($modifiedContainer);
2726
}
@@ -40,24 +39,28 @@ protected static function modifyContainer(
4039

4140
protected static function createContainer(ArrayObject $definitions): IContainer
4241
{
43-
$registry =
44-
new class($definitions) implements IDefinitionRegistry {
45-
public function __construct(protected Traversable $definitions)
46-
{
47-
}
42+
$registry = self::createDefinitionRegistry($definitions);
4843

49-
public function load(): Traversable
50-
{
51-
return $this->definitions;
52-
}
44+
return (new ContainerFactory($registry))->create();
45+
}
46+
47+
protected static function createDefinitionRegistry(ArrayObject $definitions): IDefinitionRegistry
48+
{
49+
return new class($definitions) implements IDefinitionRegistry {
50+
public function __construct(protected Traversable $definitions)
51+
{
52+
}
5353

54-
public function bind(IServiceDefinition $serviceDefinition): void
55-
{
56-
// do nothing
57-
}
58-
};
54+
public function load(): Traversable
55+
{
56+
return $this->definitions;
57+
}
5958

60-
return (new ContainerFactory($registry))->create();
59+
public function bind(IServiceDefinition $serviceDefinition): void
60+
{
61+
// do nothing
62+
}
63+
};
6164
}
6265

6366
protected static function modifyDefinitions(ArrayObject $definitions, array $substitutes = []): ArrayObject

‎tests/TestCase/FacadeAwareTestCase.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ protected function setUp(): void
2222
{
2323
parent::setUp();
2424
self::storeContainer();
25-
self::setTestContainer();
25+
static::setTestContainer();
2626
}
2727

28-
protected static function storeContainer(): void
28+
private static function storeContainer(): void
2929
{
3030
self::$container = self::extractContainer();
3131
}
@@ -51,7 +51,7 @@ protected function tearDown(): void
5151
parent::tearDown();
5252
}
5353

54-
protected static function rollbackContainer(): void
54+
private static function rollbackContainer(): void
5555
{
5656
self::setContainer(self::$container);
5757
}

0 commit comments

Comments
 (0)