Merge pull request #7 from sirn-se/return-fix

sirn-se · web-flow · commit 483228156e06 · 2024-09-12T08:49:16.000+02:00
Fix: Return switch null, not falsy
diff --git a/src/ErrorHandler.php b/src/ErrorHandler.php
@@ -63,7 +63,7 @@ public function with(callable $callback, $handling = null, int $levels = E_ALL)
         } finally {
             $this->restore();
         }
-        return $error ?: $result;
+        return $error ?? $result;
     }
 
     /**
@@ -85,9 +85,10 @@ public function withAll(callable $callback, $handling = null, int $levels = E_AL
         $result = $callback();
         $this->restore();
         $error = empty($errors) ? null : $this->handle($handling, $errors, $result);
-        return $error ?: $result;
+        return $error ?? $result;
     }
 
+
     /* ----------------- Private helpers --------------------------------------------- */
 
     // Get handler function

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function with(callable $callback, $handling = null, int $levels = E_ALL)`
`63`	`63`	`} finally {`
`64`	`64`	`$this->restore();`
`65`	`65`	`}`
`66`		`- return $error ?: $result;`
	`66`	`+ return $error ?? $result;`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`/**`
`@@ -85,9 +85,10 @@ public function withAll(callable $callback, $handling = null, int $levels = E_AL`
`85`	`85`	`$result = $callback();`
`86`	`86`	`$this->restore();`
`87`	`87`	`$error = empty($errors) ? null : $this->handle($handling, $errors, $result);`
`88`		`- return $error ?: $result;`
	`88`	`+ return $error ?? $result;`
`89`	`89`	`}`
`90`	`90`
	`91`	`+`
`91`	`92`	`/* ----------------- Private helpers --------------------------------------------- */`
`92`	`93`
`93`	`94`	`// Get handler function`