Skip to content

Commit a9e7993

Browse files
mabarmabar
committed
MultiValueEfficientRule -> PhasedRule, MultiValueEfficientRuleAdapter -> PhasedRuleAdapter
1 parent 0ed26b3 commit a9e7993

File tree

9 files changed

+29
-25
lines changed

9 files changed

+29
-25
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
3535
- `getFields()` always returns the same instances
3636
- `DefaultProcessor`
3737
- creates `MappedObjectType` only when necessary (performance optimization)
38+
- `MultiValueEfficientRule`
39+
- renamed to `PhasedRule`
40+
- `MultiValueEfficientRuleAdapter`
41+
- renamed to `PhasedRuleAdapter`
3842

3943
### Removed
4044

‎src/Rules/ArrayOfRule.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ public function processValue($value, Args $args, FieldContext $context): array
127127
$itemMeta = $args->itemRuleMeta;
128128
$itemRule = $context->getRule($itemMeta->getType());
129129
$itemArgs = $itemMeta->getArgs();
130-
if (!$itemRule instanceof MultiValueEfficientRule) {
131-
$itemRule = new MultiValueEfficientRuleAdapter($itemRule);
130+
if (!$itemRule instanceof PhasedRule) {
131+
$itemRule = new PhasedRuleAdapter($itemRule);
132132
$phasedRule = false;
133133
} else {
134134
$phasedRule = true;

‎src/Rules/ListOfRule.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ public function processValue($value, Args $args, FieldContext $context): array
100100
$itemMeta = $args->itemRuleMeta;
101101
$itemRule = $context->getRule($itemMeta->getType());
102102
$itemArgs = $itemMeta->getArgs();
103-
if (!$itemRule instanceof MultiValueEfficientRule) {
104-
$itemRule = new MultiValueEfficientRuleAdapter($itemRule);
103+
if (!$itemRule instanceof PhasedRule) {
104+
$itemRule = new PhasedRuleAdapter($itemRule);
105105
$phasedRule = false;
106106
} else {
107107
$phasedRule = true;

‎src/Rules/MultiValueEfficientRule.php renamed to ‎src/Rules/PhasedRule.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* @template T_ARGS of Args
1212
* @extends Rule<T_ARGS>
1313
*/
14-
interface MultiValueEfficientRule extends Rule
14+
interface PhasedRule extends Rule
1515
{
1616

1717
/**

‎src/Rules/MultiValueEfficientRuleAdapter.php renamed to ‎src/Rules/PhasedRuleAdapter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
use Orisai\ObjectMapper\Types\Type;
1111

1212
/**
13-
* @implements MultiValueEfficientRule<Args>
13+
* @implements PhasedRule<Args>
1414
*/
15-
final class MultiValueEfficientRuleAdapter implements MultiValueEfficientRule
15+
final class PhasedRuleAdapter implements PhasedRule
1616
{
1717

1818
/** @var Rule<Args> */

‎tests/Doubles/Rules/EfficientTestRule.php renamed to ‎tests/Doubles/Rules/PhasedTestRule.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
use Orisai\ObjectMapper\Context\TypeContext;
99
use Orisai\ObjectMapper\Exception\ValueDoesNotMatch;
1010
use Orisai\ObjectMapper\Processing\Value;
11-
use Orisai\ObjectMapper\Rules\MultiValueEfficientRule;
1211
use Orisai\ObjectMapper\Rules\NoArgsRule;
12+
use Orisai\ObjectMapper\Rules\PhasedRule;
1313
use Orisai\ObjectMapper\Types\SimpleValueType;
1414

1515
/**
16-
* @implements MultiValueEfficientRule<EmptyArgs>
16+
* @implements PhasedRule<EmptyArgs>
1717
*/
18-
final class EfficientTestRule implements MultiValueEfficientRule
18+
final class PhasedTestRule implements PhasedRule
1919
{
2020

2121
use NoArgsRule;
@@ -80,7 +80,7 @@ private function addCall($value, int $phase): void
8080

8181
public function createType(Args $args, TypeContext $context): SimpleValueType
8282
{
83-
return new SimpleValueType('efficient');
83+
return new SimpleValueType('phased');
8484
}
8585

8686
}

‎tests/Unit/Rules/ArrayOfRuleTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
use Orisai\ObjectMapper\Types\GenericArrayType;
2020
use Orisai\ObjectMapper\Types\SimpleValueType;
2121
use Tests\Orisai\ObjectMapper\Doubles\Rules\AlwaysInvalidRule;
22-
use Tests\Orisai\ObjectMapper\Doubles\Rules\EfficientTestRule;
22+
use Tests\Orisai\ObjectMapper\Doubles\Rules\PhasedTestRule;
2323
use Tests\Orisai\ObjectMapper\Toolkit\ProcessingTestCase;
2424

2525
final class ArrayOfRuleTest extends ProcessingTestCase
@@ -100,15 +100,15 @@ public function testProcessValid(): void
100100

101101
public function testProcessMultiStepCallOrder(): void
102102
{
103-
$rule = new EfficientTestRule();
103+
$rule = new PhasedTestRule();
104104
$this->ruleManager->addRule($rule);
105105

106106
$value = ['foo', 'bar', 'baz', 123];
107107

108108
$processed = $this->rule->processValue(
109109
$value,
110110
new ArrayOfArgs(
111-
$this->ruleRuntimeMeta(EfficientTestRule::class),
111+
$this->ruleRuntimeMeta(PhasedTestRule::class),
112112
null,
113113
null,
114114
null,
@@ -163,7 +163,7 @@ public function testProcessMultiStepCallOrder(): void
163163

164164
public function testProcessMultiStepCallOrderWithErrors(): void
165165
{
166-
$rule = new EfficientTestRule();
166+
$rule = new PhasedTestRule();
167167
$this->ruleManager->addRule($rule);
168168

169169
$value = [$rule::Fail1, 'string' => $rule::Fail3, 'baz', 123];
@@ -173,7 +173,7 @@ public function testProcessMultiStepCallOrderWithErrors(): void
173173
$this->rule->processValue(
174174
$value,
175175
new ArrayOfArgs(
176-
$this->ruleRuntimeMeta(EfficientTestRule::class),
176+
$this->ruleRuntimeMeta(PhasedTestRule::class),
177177
$this->ruleRuntimeMeta(IntRule::class),
178178
null,
179179
null,

‎tests/Unit/Rules/ListOfRuleTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Orisai\ObjectMapper\Types\GenericArrayType;
1717
use Orisai\ObjectMapper\Types\SimpleValueType;
1818
use Tests\Orisai\ObjectMapper\Doubles\Rules\AlwaysInvalidRule;
19-
use Tests\Orisai\ObjectMapper\Doubles\Rules\EfficientTestRule;
19+
use Tests\Orisai\ObjectMapper\Doubles\Rules\PhasedTestRule;
2020
use Tests\Orisai\ObjectMapper\Toolkit\ProcessingTestCase;
2121

2222
final class ListOfRuleTest extends ProcessingTestCase
@@ -93,15 +93,15 @@ public function testProcessValid(): void
9393

9494
public function testProcessMultiStepCallOrder(): void
9595
{
96-
$rule = new EfficientTestRule();
96+
$rule = new PhasedTestRule();
9797
$this->ruleManager->addRule($rule);
9898

9999
$value = ['foo', 'bar', 'baz', 123];
100100

101101
$processed = $this->rule->processValue(
102102
$value,
103103
new MultiValueArgs(
104-
new RuleRuntimeMeta(EfficientTestRule::class, new EmptyArgs()),
104+
new RuleRuntimeMeta(PhasedTestRule::class, new EmptyArgs()),
105105
null,
106106
null,
107107
false,
@@ -155,7 +155,7 @@ public function testProcessMultiStepCallOrder(): void
155155

156156
public function testProcessMultiStepCallOrderWithErrors(): void
157157
{
158-
$rule = new EfficientTestRule();
158+
$rule = new PhasedTestRule();
159159
$this->ruleManager->addRule($rule);
160160

161161
$value = [$rule::Fail1, 42 => $rule::Fail3, 'baz', 123];
@@ -165,7 +165,7 @@ public function testProcessMultiStepCallOrderWithErrors(): void
165165
$this->rule->processValue(
166166
$value,
167167
new MultiValueArgs(
168-
new RuleRuntimeMeta(EfficientTestRule::class, new EmptyArgs()),
168+
new RuleRuntimeMeta(PhasedTestRule::class, new EmptyArgs()),
169169
null,
170170
null,
171171
false,

‎tests/Unit/Rules/MultiValueEfficientRuleAdapterTest.php renamed to ‎tests/Unit/Rules/PhasedRuleAdapterTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
use Orisai\Exceptions\Logic\NotImplemented;
66
use Orisai\ObjectMapper\Args\EmptyArgs;
77
use Orisai\ObjectMapper\Rules\MixedRule;
8-
use Orisai\ObjectMapper\Rules\MultiValueEfficientRuleAdapter;
8+
use Orisai\ObjectMapper\Rules\PhasedRuleAdapter;
99
use Orisai\ObjectMapper\Types\SimpleValueType;
1010
use Tests\Orisai\ObjectMapper\Toolkit\ProcessingTestCase;
1111

12-
final class MultiValueEfficientRuleAdapterTest extends ProcessingTestCase
12+
final class PhasedRuleAdapterTest extends ProcessingTestCase
1313
{
1414

15-
private MultiValueEfficientRuleAdapter $rule;
15+
private PhasedRuleAdapter $rule;
1616

1717
protected function setUp(): void
1818
{
1919
parent::setUp();
20-
$this->rule = new MultiValueEfficientRuleAdapter(new MixedRule());
20+
$this->rule = new PhasedRuleAdapter(new MixedRule());
2121
}
2222

2323
public function testResolveArgs(): void

0 commit comments

Comments
 (0)