Merge pull request #296 from jolicode/deprecations

Avoid internal deprecation when calling with() without a context
jolicode · Feb 26, 2024 · c6c9008 · c6c9008
2 parents bc667be + 3c8c517
commit c6c9008
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/ContextRegistry.php b/src/ContextRegistry.php
@@ -79,6 +79,11 @@ public function get(?string $name = null): Context
         return $context;
     }
 
+    public function hasCurrentContext(): bool
+    {
+        return isset($this->currentContext);
+    }
+
     public function setCurrentContext(Context $context): void
     {
         $this->currentContext = $context;

diff --git a/src/functions.php b/src/functions.php
@@ -808,11 +808,15 @@ function with(
     Context|string|null $context = null,
 ): mixed {
     $contextRegistry = GlobalHelper::getContextRegistry();
-    $initialContext = $contextRegistry->getCurrentContext();
-    $context ??= $initialContext;
 
+    $initialContext = null;
+    if ($contextRegistry->hasCurrentContext()) {
+        $initialContext = $contextRegistry->getCurrentContext();
+    }
+
+    $context ??= new Context();
     if (\is_string($context)) {
-        $context = context($context);
+        $context = $contextRegistry->get($context);
     }
 
     if (null !== $data) {
@@ -856,7 +860,9 @@ function with(
     try {
         return $callback($context);
     } finally {
-        $contextRegistry->setCurrentContext($initialContext);
+        if ($initialContext) {
+            $contextRegistry->setCurrentContext($initialContext);
+        }
     }
 }