[12.x] Fix usage of Scoped and Singleton on interfaces

src/Illuminate/Container/Container.php

@@ -267,7 +267,7 @@ public function resolved($abstract)
      * @param  string  $abstract
      * @return bool
      */
-    public function isShared($abstract)
+        public function isShared($abstract)
     {
         if (isset($this->instances[$abstract])) {
             return true;
@@ -281,23 +281,39 @@ public function isShared($abstract)
             return false;
         }
 
-        $reflection = new ReflectionClass($abstract);
-
-        if (! empty($reflection->getAttributes(Singleton::class))) {
-            return true;
+        if ($scopedType = $this->getScopedTyped(new ReflectionClass($abstract)) === null) {
+            return false;
         }
 
-        if (! empty($reflection->getAttributes(Scoped::class))) {
+        if ($scopedType === 'scoped') {
             if (! in_array($abstract, $this->scopedInstances, true)) {
                 $this->scopedInstances[] = $abstract;
             }
+        }
 
-            return true;
+        return true;
+    }
+
+    /**
+     * Determine if a ReflectionClass has scoping attributes applied.
+     *
+     * @param  ReflectionClass<object>  $reflection
+     * @return "singleton"|"scoped"|null
+     */
+    protected function getScopedTyped(ReflectionClass $reflection): ?string
+    {
+        if (! empty($reflection->getAttributes(Singleton::class))) {
+            return 'singleton';
         }
 
-        return false;
+        if (! empty($reflection->getAttributes(Scoped::class))) {
+            return 'scoped';
+        }
+
+        return null;
     }
 
+
     /**
      * Determine if a given string is an alias.
      *

tests/Container/ContainerTest.php

@@ -875,6 +875,17 @@ public function testNoMatchingEnvironmentAndNoWildcardThrowsBindingResolutionExc
         $container->make(ProdEnvOnlyInterface::class);
     }
 
+    public function testScopedSingletonWithBind()
+    {
+        $container = new Container;
+        $container->resolveEnvironmentUsing(fn ($environments) => true);
+
+        $original = $container->make(HasScope::class);
+        $new = $container->make(HasScope::class);
+
+        $this->assertSame($original, $new);
+    }
+
     // public function testContainerCanCatchCircularDependency()
     // {
     //     $this->expectException(\Illuminate\Contracts\Container\CircularDependencyException::class);
@@ -1131,3 +1142,14 @@ class OriginalConcrete implements OverrideInterface
 class AltConcrete implements OverrideInterface
 {
 }
+
+
+#[Bind(HasScopeConcrete::class)]
+#[Scoped]
+interface HasScope
+{
+}
+
+class HasScopeConcrete implements HasScope
+{
+}