Enforce instanceOf for factory shares

system/Config/Factories.php

@@ -102,19 +102,23 @@ public static function __callStatic(string $component, array $arguments)
 		if (isset(self::$basenames[$options['component']][$basename]))
 		{
 			$class = self::$basenames[$options['component']][$basename];
-		}
-		else
-		{
-			// Try to locate the class
-			if (! $class = self::locateClass($options, $name))
+
+			// Need to verify if the shared instance matches the request
+			if (self::verifyInstanceOf($options, $class))
 			{
-				return null;
+				return self::$instances[$options['component']][$class];
 			}
+		}
 
-			self::$instances[$options['component']][$class]    = new $class(...$arguments);
-			self::$basenames[$options['component']][$basename] = $class;
+		// Try to locate the class
+		if (! $class = self::locateClass($options, $name))
+		{
+			return null;
 		}
 
+		self::$instances[$options['component']][$class]    = new $class(...$arguments);
+		self::$basenames[$options['component']][$basename] = $class;
+
 		return self::$instances[$options['component']][$class];
 	}
 

tests/system/Config/FactoriesTest.php

@@ -217,6 +217,14 @@ public function testRespectsInstanceOf()
 		$this->assertNull($result);
 	}
 
+	public function testSharedRespectsInstanceOf()
+	{
+		Factories::injectMock('widgets', 'SomeWidget', new OtherWidget());
+
+		$result = Factories::widgets('SomeWidget', ['instanceOf' => stdClass::class]);
+		$this->assertInstanceOf(SomeWidget::class, $result);
+	}
+
 	public function testPrioritizesParameterOptions()
 	{
 		Factories::setOptions('widgets', ['instanceOf' => stdClass::class]);