toFiberScope, toMutatingScope - take advantage of inheritance and polymorphism

Author: ondrejmirtes

src/Analyser/Fiber/FiberScope.php

@@ -11,6 +11,33 @@
 final class FiberScope extends MutatingScope
 {
 
+	public function toFiberScope(): self
+	{
+		return $this;
+	}
+
+	public function toMutatingScope(): MutatingScope
+	{
+		return $this->scopeFactory->toMutatingFactory()->create(
+			$this->context,
+			$this->isDeclareStrictTypes(),
+			$this->getFunction(),
+			$this->getNamespace(),
+			$this->expressionTypes,
+			$this->nativeExpressionTypes,
+			$this->conditionalExpressions,
+			$this->inClosureBindScopeClasses,
+			$this->getAnonymousFunctionReflection(),
+			$this->isInFirstLevelStatement(),
+			$this->currentlyAssignedExpressions,
+			$this->currentlyAllowedUndefinedExpressions,
+			$this->inFunctionCallsStack,
+			$this->afterExtractCall,
+			$this->getParentScope(),
+			$this->nativeTypesPromoted,
+		);
+	}
+
 	/** @api */
 	public function getType(Expr $node): Type
 	{

src/Analyser/MutatingScope.php

@@ -167,6 +167,7 @@
 use function usort;
 use const PHP_INT_MAX;
 use const PHP_INT_MIN;
+use const PHP_VERSION_ID;
 
 class MutatingScope implements Scope, NodeCallbackInvoker
 {
@@ -205,7 +206,7 @@ class MutatingScope implements Scope, NodeCallbackInvoker
 	 * @param list<array{MethodReflection|FunctionReflection|null, ParameterReflection|null}> $inFunctionCallsStack
 	 */
 	public function __construct(
-		private InternalScopeFactory $scopeFactory,
+		protected InternalScopeFactory $scopeFactory,
 		private ReflectionProvider $reflectionProvider,
 		private InitializerExprTypeResolver $initializerExprTypeResolver,
 		private DynamicReturnTypeExtensionRegistry $dynamicReturnTypeExtensionRegistry,
@@ -217,26 +218,26 @@ public function __construct(
 		private NodeScopeResolver $nodeScopeResolver,
 		private RicherScopeGetTypeHelper $richerScopeGetTypeHelper,
 		private ConstantResolver $constantResolver,
-		private ScopeContext $context,
+		protected ScopeContext $context,
 		private PhpVersion $phpVersion,
 		private AttributeReflectionFactory $attributeReflectionFactory,
 		private int|array|null $configPhpVersion,
 		private $nodeCallback = null,
 		private bool $declareStrictTypes = false,
 		private PhpFunctionFromParserNodeReflection|null $function = null,
 		?string $namespace = null,
-		private array $expressionTypes = [],
-		private array $nativeExpressionTypes = [],
-		private array $conditionalExpressions = [],
-		private array $inClosureBindScopeClasses = [],
+		protected array $expressionTypes = [],
+		protected array $nativeExpressionTypes = [],
+		protected array $conditionalExpressions = [],
+		protected array $inClosureBindScopeClasses = [],
 		private ?ClosureType $anonymousFunctionReflection = null,
 		private bool $inFirstLevelStatement = true,
-		private array $currentlyAssignedExpressions = [],
-		private array $currentlyAllowedUndefinedExpressions = [],
-		private array $inFunctionCallsStack = [],
-		private bool $afterExtractCall = false,
+		protected array $currentlyAssignedExpressions = [],
+		protected array $currentlyAllowedUndefinedExpressions = [],
+		protected array $inFunctionCallsStack = [],
+		protected bool $afterExtractCall = false,
 		private ?Scope $parentScope = null,
-		private bool $nativeTypesPromoted = false,
+		protected bool $nativeTypesPromoted = false,
 	)
 	{
 		if ($namespace === '') {
@@ -248,8 +249,8 @@ public function __construct(
 
 	public function toFiberScope(): self
 	{
-		if (static::class === FiberScope::class) {
-			return $this;
+		if (PHP_VERSION_ID < 80100) {
+			throw new ShouldNotHappenException('Cannot create FiberScope below PHP 8.1');
 		}
 
 		return $this->scopeFactory->toFiberFactory()->create(
@@ -274,28 +275,7 @@ public function toFiberScope(): self
 
 	public function toMutatingScope(): self
 	{
-		if (static::class === self::class) {
-			return $this;
-		}
-
-		return $this->scopeFactory->toMutatingFactory()->create(
-			$this->context,
-			$this->isDeclareStrictTypes(),
-			$this->getFunction(),
-			$this->getNamespace(),
-			$this->expressionTypes,
-			$this->nativeExpressionTypes,
-			$this->conditionalExpressions,
-			$this->inClosureBindScopeClasses,
-			$this->anonymousFunctionReflection,
-			$this->isInFirstLevelStatement(),
-			$this->currentlyAssignedExpressions,
-			$this->currentlyAllowedUndefinedExpressions,
-			$this->inFunctionCallsStack,
-			$this->afterExtractCall,
-			$this->parentScope,
-			$this->nativeTypesPromoted,
-		);
+		return $this;
 	}
 
 	/** @api */