Merge pull request #232 from jolicode/set-a-default-context

Fix issue when using `ContextRegistry::getCurrentContext()` without setting first a context
jolicode · Jan 11, 2024 · 1ff3f1a · 1ff3f1a
2 parents 4374f8e + ab38691
commit 1ff3f1a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 ## Not released yet
 
+## 0.11.1 (2024-01-11)
+
+* Fix issue when using `ContextRegistry::getCurrentContext()` without setting first a context
+* Calling `ContextRegistry::getCurrentContext()` without `setCurrentContext()`
+  is deprecated. Pass a `$context` instead to the function, or set a current
+  context before.
+
 ## 0.11.0 (2024-01-11)
 
 * Add `AsListener` attribute to register an event listener

diff --git a/src/Console/Application.php b/src/Console/Application.php
@@ -43,7 +43,7 @@
 class Application extends SymfonyApplication
 {
     public const NAME = 'castor';
-    public const VERSION = 'v0.11.0';
+    public const VERSION = 'v0.11.1';
 
     // "Current" objects availables at some point of the lifecycle
     private InputInterface $input;

diff --git a/src/ContextRegistry.php b/src/ContextRegistry.php
@@ -78,7 +78,13 @@ public function setCurrentContext(Context $context): void
 
     public function getCurrentContext(): Context
     {
-        return $this->currentContext ?? throw new \LogicException('Current context not set yet.');
+        if (isset($this->currentContext)) {
+            return $this->currentContext;
+        }
+
+        trigger_deprecation('castor', '0.11.1', 'Calling getCurrentContext() without setCurrentContext() is deprecated. Pass a context instead to the function, or set a Current context before.');
+
+        return new Context();
     }
 
     /**