Skip to content

Commit 2964281

Browse files
igorwigorw
committed
Merge remote-tracking branch 'origin/terminology'
* origin/terminology: Fix terminology Rename ResolvedPromise to FulfilledPromise
2 parents caee9ca + b3fd391 commit 2964281

13 files changed

Lines changed: 53 additions & 53 deletions

src/React/Promise/ResolvedPromise.php renamed to src/React/Promise/FulfilledPromise.php

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

33
namespace React\Promise;
44

5-
class ResolvedPromise implements PromiseInterface
5+
class FulfilledPromise implements PromiseInterface
66
{
77
private $result;
88

‎src/React/Promise/Util.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public static function resolve($promiseOrValue)
1010
return $promiseOrValue;
1111
}
1212

13-
return new ResolvedPromise($promiseOrValue);
13+
return new FulfilledPromise($promiseOrValue);
1414
}
1515

1616
public static function reject($promiseOrValue)

‎src/React/Promise/When.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public static function some($promisesOrValues, $howMany, $fulfilledHandler = nul
4444

4545
$progress = array($deferred, 'progress');
4646

47-
$resolveOne = function ($val, $i) use (&$values, &$toResolve, $deferred) {
47+
$fulfillOne = function ($val, $i) use (&$values, &$toResolve, $deferred) {
4848
$values[$i] = $val;
4949

5050
if (0 === --$toResolve) {
@@ -63,23 +63,23 @@ public static function some($promisesOrValues, $howMany, $fulfilledHandler = nul
6363
};
6464

6565
foreach ($array as $i => $promiseOrValue) {
66-
$resolve = function ($val) use ($i, &$resolveOne, &$rejectOne) {
67-
$reset = $resolveOne($val, $i);
66+
$fulfiller = function ($val) use ($i, &$fulfillOne, &$rejectOne) {
67+
$reset = $fulfillOne($val, $i);
6868

6969
if (true === $reset) {
70-
$resolveOne = $rejectOne = function () {};
70+
$fulfillOne = $rejectOne = function () {};
7171
}
7272
};
7373

74-
$reject = function ($val) use ($i, &$resolveOne, &$rejectOne) {
74+
$rejecter = function ($val) use ($i, &$fulfillOne, &$rejectOne) {
7575
$reset = $rejectOne($val, $i);
7676

7777
if (true === $reset) {
78-
$resolveOne = $rejectOne = function () {};
78+
$fulfillOne = $rejectOne = function () {};
7979
}
8080
};
8181

82-
Util::resolve($promiseOrValue)->then($resolve, $reject, $progress);
82+
Util::resolve($promiseOrValue)->then($fulfiller, $rejecter, $progress);
8383
}
8484
}
8585

‎tests/React/Promise/DeferredResolveTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function shouldResolveWithPromisedValue()
4545

4646
$d
4747
->resolver()
48-
->resolve(new ResolvedPromise(1));
48+
->resolve(new FulfilledPromise(1));
4949
}
5050

5151
/** @test */

tests/React/Promise/ResolvedPromiseTest.php renamed to tests/React/Promise/FulfilledPromiseTest.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44

55
/**
66
* @group Promise
7-
* @group ResolvedPromise
7+
* @group FulfilledPromise
88
*/
9-
class ResolvedPromiseTest extends TestCase
9+
class FulfilledPromiseTest extends TestCase
1010
{
1111
/** @test */
1212
public function shouldReturnAPromise()
1313
{
14-
$p = new ResolvedPromise();
14+
$p = new FulfilledPromise();
1515
$this->assertInstanceOf('React\\Promise\\PromiseInterface', $p->then());
1616
}
1717

1818
/** @test */
1919
public function shouldReturnAllowNull()
2020
{
21-
$p = new ResolvedPromise();
21+
$p = new FulfilledPromise();
2222
$this->assertInstanceOf('React\\Promise\\PromiseInterface', $p->then(null, null, null));
2323
}
2424

@@ -31,7 +31,7 @@ public function shouldForwardResultWhenCallbackIsNull()
3131
->method('__invoke')
3232
->with($this->identicalTo(1));
3333

34-
$p = new ResolvedPromise(1);
34+
$p = new FulfilledPromise(1);
3535
$p
3636
->then(
3737
null,
@@ -52,7 +52,7 @@ public function shouldForwardCallbackResultToNextCallback()
5252
->method('__invoke')
5353
->with($this->identicalTo(2));
5454

55-
$p = new ResolvedPromise(1);
55+
$p = new FulfilledPromise(1);
5656
$p
5757
->then(
5858
function ($val) {
@@ -75,11 +75,11 @@ public function shouldForwardPromisedCallbackResultValueToNextCallback()
7575
->method('__invoke')
7676
->with($this->identicalTo(2));
7777

78-
$p = new ResolvedPromise(1);
78+
$p = new FulfilledPromise(1);
7979
$p
8080
->then(
8181
function ($val) {
82-
return new ResolvedPromise($val + 1);
82+
return new FulfilledPromise($val + 1);
8383
},
8484
$this->expectCallableNever()
8585
)
@@ -98,7 +98,7 @@ public function shouldSwitchFromCallbacksToErrbacksWhenCallbackReturnsARejection
9898
->method('__invoke')
9999
->with($this->identicalTo(2));
100100

101-
$p = new ResolvedPromise(1);
101+
$p = new FulfilledPromise(1);
102102
$p
103103
->then(
104104
function ($val) {
@@ -129,7 +129,7 @@ public function shouldSwitchFromCallbacksToErrbacksWhenCallbackThrows()
129129
->method('__invoke')
130130
->with($this->identicalTo($exception));
131131

132-
$p = new ResolvedPromise(1);
132+
$p = new FulfilledPromise(1);
133133
$p
134134
->then(
135135
$mock,

‎tests/React/Promise/RejectedPromiseTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function shouldSwitchFromErrbacksToCallbacksWhenErrbackReturnsAResolution
8585
->then(
8686
$this->expectCallableNever(),
8787
function ($val) {
88-
return new ResolvedPromise($val + 1);
88+
return new FulfilledPromise($val + 1);
8989
}
9090
)
9191
->then(

‎tests/React/Promise/UtilRejectTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ public function shouldRejectAnImmediateValue()
2727
}
2828

2929
/** @test */
30-
public function shouldRejectAResolvedPromise()
30+
public function shouldRejectAFulfilledPromise()
3131
{
3232
$expected = 123;
3333

34-
$resolved = new ResolvedPromise($expected);
34+
$resolved = new FulfilledPromise($expected);
3535

3636
$mock = $this->createCallableMock();
3737
$mock

‎tests/React/Promise/UtilResolveTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ public function shouldResolveAnImmediateValue()
2727
}
2828

2929
/** @test */
30-
public function shouldResolveAResolvedPromise()
30+
public function shouldResolveAFulfilledPromise()
3131
{
3232
$expected = 123;
3333

34-
$resolved = new ResolvedPromise($expected);
34+
$resolved = new FulfilledPromise($expected);
3535

3636
$mock = $this->createCallableMock();
3737
$mock

‎tests/React/Promise/WhenAllTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function shouldResolvePromisesArray()
4545
->with($this->identicalTo(array(1, 2, 3)));
4646

4747
When::all(
48-
array(new ResolvedPromise(1), new ResolvedPromise(2), new ResolvedPromise(3)),
48+
array(new FulfilledPromise(1), new FulfilledPromise(2), new FulfilledPromise(3)),
4949
$mock
5050
);
5151
}
@@ -75,7 +75,7 @@ public function shouldRejectIfAnyInputPromiseRejects()
7575
->with($this->identicalTo(2));
7676

7777
When::all(
78-
array(new ResolvedPromise(1), new RejectedPromise(2), new ResolvedPromise(3)),
78+
array(new FulfilledPromise(1), new RejectedPromise(2), new FulfilledPromise(3)),
7979
$this->expectCallableNever(),
8080
$mock
8181
);
@@ -91,7 +91,7 @@ public function shouldAcceptAPromiseForAnArray()
9191
->with($this->identicalTo(array(1, 2, 3)));
9292

9393
When::all(
94-
new ResolvedPromise(array(1, 2, 3)),
94+
new FulfilledPromise(array(1, 2, 3)),
9595
$mock
9696
);
9797
}
@@ -106,7 +106,7 @@ public function shouldResolveToEmptyArrayWhenInputPromiseDoesNotResolveToArray()
106106
->with($this->identicalTo(array()));
107107

108108
When::all(
109-
new ResolvedPromise(1),
109+
new FulfilledPromise(1),
110110
$mock
111111
);
112112
}

‎tests/React/Promise/WhenAnyTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function shouldResolveWithAPromisedInputValue()
4545
->with($this->identicalTo(1));
4646

4747
When::any(
48-
array(new ResolvedPromise(1), new ResolvedPromise(2), new ResolvedPromise(3)),
48+
array(new FulfilledPromise(1), new FulfilledPromise(2), new FulfilledPromise(3)),
4949
$mock
5050
);
5151
}
@@ -76,7 +76,7 @@ public function shouldResolveWhenFirstInputPromiseResolves()
7676
->with($this->identicalTo(1));
7777

7878
When::any(
79-
array(new ResolvedPromise(1), new RejectedPromise(2), new RejectedPromise(3)),
79+
array(new FulfilledPromise(1), new RejectedPromise(2), new RejectedPromise(3)),
8080
$mock
8181
);
8282
}
@@ -91,7 +91,7 @@ public function shouldAcceptAPromiseForAnArray()
9191
->with($this->identicalTo(1));
9292

9393
When::any(
94-
new ResolvedPromise(array(1, 2, 3)),
94+
new FulfilledPromise(array(1, 2, 3)),
9595
$mock
9696
);
9797
}
@@ -106,7 +106,7 @@ public function shouldResolveToNullArrayWhenInputPromiseDoesNotResolveToArray()
106106
->with($this->identicalTo(null));
107107

108108
When::any(
109-
new ResolvedPromise(1),
109+
new FulfilledPromise(1),
110110
$mock
111111
);
112112
}

0 commit comments

Comments
 (0)