wip: test unhandled rejections

Author: g105b

src/Promise.php

@@ -219,43 +219,34 @@ private function handleThen(ThenChain $then):bool {
 
 	private function handleFinally(FinallyChain $finally):bool {
 		if($this->getState() === PromiseState::RESOLVED) {
-			try {
-				$result = $finally->callOnResolved($this->resolvedValue);
-				if($result instanceof PromiseInterface) {
-					$this->chainPromise($result);
-				}
-				elseif(is_null($result)) {
-					$this->stopChain = true;
-					return true;
-				}
-				else {
-					$this->resolvedValue = $result;
-					$this->resolvedValueSet = true;
-					$this->tryComplete();
-				}
+			$result = $finally->callOnResolved($this->resolvedValue);
+			if($result instanceof PromiseInterface) {
+				$this->chainPromise($result);
 			}
-			catch(Throwable $reason) {
-				$this->reject($reason);
+			elseif(is_null($result)) {
+				$this->stopChain = true;
+				return true;
 			}
+			else {
+				$this->resolvedValue = $result;
+				$this->resolvedValueSet = true;
+				$this->tryComplete();
+			}
+
 		}
 		elseif($this->getState() === PromiseState::REJECTED) {
-			try {
-				$result = $finally->callOnRejected($this->rejectedReason);
-				if($result instanceof PromiseInterface) {
-					$this->chainPromise($result);
-				}
-				elseif(is_null($result)) {
-					$this->stopChain = true;
-					return true;
-				}
-				else {
-					$this->resolvedValue = $result;
-					$this->resolvedValueSet = true;
-					$this->tryComplete();
-				}
+			$result = $finally->callOnRejected($this->rejectedReason);
+			if($result instanceof PromiseInterface) {
+				$this->chainPromise($result);
 			}
-			catch(Throwable $reason) {
-				$this->reject($reason);
+			elseif(is_null($result)) {
+				$this->stopChain = true;
+				return true;
+			}
+			else {
+				$this->resolvedValue = $result;
+				$this->resolvedValueSet = true;
+				$this->tryComplete();
 			}
 		}
 

test/phpunit/PromiseTest.php

@@ -474,20 +474,23 @@ public function testFinallyCanReturnPromise() {
 		self::assertSame("First return", $finallyLog[1]);
 	}
 
-	public function testOnRejectedCalledWhenFinallyThrows() {
+	public function testOnRejectedNotCalledWhenFinallyThrows() {
 		$exception = new PromiseException("Oh dear, oh dear");
+		$actualException = null;
 		$promiseContainer = $this->getTestPromiseContainer();
 
 		self::expectException(PromiseException::class);
 		self::expectExceptionMessage("Oh dear, oh dear");
 		$sut = $promiseContainer->getPromise();
-		$sut->finally(function() use ($exception) {
+		$sut->finally(function(string $message) use ($exception) {
 			throw $exception;
-		})->then(
-			self::mockCallable(1, "Example resolution"),
-			self::mockCallable(0)
-		);
+		})->then(function(string $message) {
+			return "$message-appended";
+		})->catch(function(Throwable $reason) use(&$actualException) {
+			$actualException = $reason;
+		});
 		$promiseContainer->resolve("Example resolution");
+		self::assertNull($actualException);
 	}
 
 	public function testGetStatePending() {