feature: throw rejections that aren't handled

closes #63
PhpGt · Jul 1, 2023 · 907b3a4 · 907b3a4
1 parent ccc1927
commit 907b3a4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 35 deletions.
diff --git a/src/Promise.php b/src/Promise.php
@@ -15,14 +15,15 @@ class Promise implements PromiseInterface {
 	private array $chain;
 	/** @var CatchChain[] */
 	private array $uncalledCatchChain;
+	/** @var Throwable[] */
+	private array $handledRejections;
 	/** @var callable */
 	private $executor;
-	private bool $completed;
 
 	public function __construct(callable $executor) {
-		$this->completed = false;
 		$this->chain = [];
 		$this->uncalledCatchChain = [];
+		$this->handledRejections = [];
 
 		$this->executor = $executor;
 		$this->callExecutor();
@@ -123,7 +124,8 @@ private function reset():void {
 	}
 
 	private function tryComplete():void {
-		if(empty($this->chain) && $this->getState() === PromiseState::PENDING) {
+		if(empty($this->chain)) {
+			$this->throwUnhandledRejection();
 			return;
 		}
 		if($this->getState() !== PromiseState::PENDING) {
@@ -145,10 +147,7 @@ function(Chainable $a, Chainable $b) {
 				return 0;
 			}
 		);
-		$handledRejections = [];
 
-		$emptyChain = empty($this->chain);
-		$originalChain = $this->chain;
 		while($this->getState() !== PromiseState::PENDING) {
 			$chainItem = $this->getNextChainItem();
 			if(!$chainItem) {
@@ -160,17 +159,15 @@ function(Chainable $a, Chainable $b) {
 			}
 			elseif($chainItem instanceof CatchChain) {
 				if($handled = $this->handleCatch($chainItem)) {
-					array_push($handledRejections, $handled);
+					array_push($this->handledRejections, $handled);
 				}
 			}
 			elseif($chainItem instanceof FinallyChain) {
 				$this->handleFinally($chainItem);
 			}
 		}
 
-		$this->handleCatches($originalChain, $emptyChain, $handledRejections);
-
-		$this->completed = true;
+		$this->throwUnhandledRejection();
 	}
 
 	private function getNextChainItem():?Chainable {
@@ -200,7 +197,8 @@ private function handleThen(ThenChain $then):void {
 
 	private function handleCatch(CatchChain $catch):?Throwable {
 		if($this->getState() !== PromiseState::REJECTED) {
-// TODO: This is where #52 can be implemented.
+// TODO: This is where #52 can be implemented
+// see: (https://github.com/PhpGt/Promise/issues/52)
 			array_push($this->uncalledCatchChain, $catch);
 			return null;
 		}
@@ -244,29 +242,9 @@ private function handleFinally(FinallyChain $finally):void {
 		}
 	}
 
-	/**
-	 * @param array<Chainable> $chain
-	 * @param bool $emptyChain
-	 * @param array<Throwable> $handledRejections
-	 */
-	protected function handleCatches(
-		array $chain,
-		bool $emptyChain,
-		array $handledRejections,
-	):void {
-		if ($this->getState() === PromiseState::REJECTED) {
-			$hasCatch = false;
-			foreach ($chain as $chainItem) {
-				if ($chainItem instanceof CatchChain) {
-					$hasCatch = true;
-				}
-			}
-
-			if (!$hasCatch) {
-				throw $this->rejectedReason;
-			}
-
-			if (!$emptyChain && !in_array($this->rejectedReason, $handledRejections)) {
+	protected function throwUnhandledRejection():void {
+		if($this->getState() === PromiseState::REJECTED) {
+			if(!in_array($this->rejectedReason, $this->handledRejections)) {
 				throw $this->rejectedReason;
 			}
 		}

diff --git a/test/phpunit/PromiseTest.php b/test/phpunit/PromiseTest.php
@@ -55,9 +55,9 @@ public function testPromiseRejectsIfResolvedWithItself() {
 			$actualMessage = $reason->getMessage();
 		});
 
-		self::expectExceptionMessage("A Promise must not be resolved with another Promise.");
 		$promiseContainer->resolve($sut);
 		self::assertEquals(0, $onResolvedCallCount);
+		self::assertSame("A Promise must not be resolved with another Promise.", $actualMessage);
 	}
 
 	public function testRejectWithException() {