[12.x] Allowing Context Attribute to Interact with Hidden (#55799)

devajmeireles · web-flow · commit b47abb550646 · 2025-05-21T08:18:18.000-05:00
* Added hidden attribute to Context class, updated resolve method

* Added test case for context attribute interacting with hidden attributes
diff --git a/src/Illuminate/Container/Attributes/Context.php b/src/Illuminate/Container/Attributes/Context.php
@@ -13,7 +13,7 @@ class Context implements ContextualAttribute
     /**
      * Create a new attribute instance.
      */
-    public function __construct(public string $key, public mixed $default = null)
+    public function __construct(public string $key, public mixed $default = null, public bool $hidden = false)
     {
     }
 
@@ -26,6 +26,11 @@ public function __construct(public string $key, public mixed $default = null)
      */
     public static function resolve(self $attribute, Container $container): mixed
     {
-        return $container->make(Repository::class)->get($attribute->key, $attribute->default);
+        $repository = $container->make(Repository::class);
+
+        return match ($attribute->hidden) {
+            true => $repository->getHidden($attribute->key, $attribute->default),
+            false => $repository->get($attribute->key, $attribute->default),
+        };
     }
 }
diff --git a/tests/Container/ContextualAttributeBindingTest.php b/tests/Container/ContextualAttributeBindingTest.php
@@ -231,6 +231,21 @@ public function testContextAttribute(): void
         $container->make(ContextTest::class);
     }
 
+    public function testContextAttributeInteractingWithHidden(): void
+    {
+        $container = new Container;
+
+        $container->singleton(ContextRepository::class, function () {
+            $context = m::mock(ContextRepository::class);
+            $context->shouldReceive('getHidden')->once()->with('bar', null)->andReturn('bar');
+            $context->shouldNotReceive('get');
+
+            return $context;
+        });
+
+        $container->make(ContextHiddenTest::class);
+    }
+
     public function testStorageAttribute()
     {
         $container = new Container;
@@ -448,6 +463,13 @@ public function __construct(#[Context('foo')] string $foo)
     }
 }
 
+final class ContextHiddenTest
+{
+    public function __construct(#[Context('bar', hidden: true)] string $foo)
+    {
+    }
+}
+
 final class DatabaseTest
 {
     public function __construct(#[Database('foo')] Connection $foo, #[Database('bar')] Connection $bar)

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class Context implements ContextualAttribute`
`13`	`13`	`/**`
`14`	`14`	`* Create a new attribute instance.`
`15`	`15`	`*/`
`16`		`- public function __construct(public string $key, public mixed $default = null)`
	`16`	`+ public function __construct(public string $key, public mixed $default = null, public bool $hidden = false)`
`17`	`17`	`{`
`18`	`18`	`}`
`19`	`19`
`@@ -26,6 +26,11 @@ public function __construct(public string $key, public mixed $default = null)`
`26`	`26`	`*/`
`27`	`27`	`public static function resolve(self $attribute, Container $container): mixed`
`28`	`28`	`{`
`29`		`- return $container->make(Repository::class)->get($attribute->key, $attribute->default);`
	`29`	`+ $repository = $container->make(Repository::class);`
	`30`	`+`
	`31`	`+ return match ($attribute->hidden) {`
	`32`	`+ true => $repository->getHidden($attribute->key, $attribute->default),`
	`33`	`+ false => $repository->get($attribute->key, $attribute->default),`
	`34`	`+ };`
`30`	`35`	`}`
`31`	`36`	`}`