[BE] Fix invariance composition

Author: ondrejmirtes

changelog-2.0.md

@@ -37,7 +37,6 @@ Bleeding edge (TODO move to other sections)
 * Stub files validation - detect duplicate classes and functions (https://github.com/phpstan/phpstan-src/commit/ddf8d5c3859c2c75c20f525a0e2ca8b99032373a, https://github.com/phpstan/phpstan-src/commit/17e4b74335e5235d7cd6708eb687a774a0eeead4)
 * Change `curl_setopt` function signature based on 2nd arg ([#1719](https://github.com/phpstan/phpstan-src/pull/1719)), thanks @staabm!
 * Empty `skipCheckGenericClasses` (https://github.com/phpstan/phpstan-src/commit/28c2c79b16cac6ba6b01f1b4d211541dd49d8a77)
-* Fix invariance composition ([#2054](https://github.com/phpstan/phpstan-src/pull/2054)), thanks @jiripudil!
 * Validate inline PHPDoc `@var` tag type against native type (https://github.com/phpstan/phpstan-src/commit/a69e3bc2f1e87f6da1e65d7935f1cc36bd5c42fe)
     * Set [`reportWrongPhpDocTypeInVarTag`](https://phpstan.org/config-reference#reportwrongphpdoctypeinvartag) to `true` to have all types validated, not just native ones
 * Always report always true conditions, except for last elseif and match arm ([#2105](https://github.com/phpstan/phpstan-src/pull/2105)), thanks @staabm!
@@ -144,6 +143,8 @@ Improvements 🔧
 Bugfixes 🐛
 =====================
 
+* Fix invariance composition ([#2054](https://github.com/phpstan/phpstan-src/pull/2054)), thanks @jiripudil!
+
 Function signature fixes 🤖
 =======================
 

conf/bleedingEdge.neon

@@ -26,7 +26,6 @@ parameters:
 		duplicateStubs: true
 		logicalXor: true
 		betterNoop: true
-		invarianceComposition: true
 		alwaysTrueAlwaysReported: true
 		disableUnreachableBranchesRules: true
 		varTagType: true

conf/config.neon

@@ -61,7 +61,6 @@ parameters:
 		duplicateStubs: false
 		logicalXor: false
 		betterNoop: false
-		invarianceComposition: false
 		alwaysTrueAlwaysReported: false
 		disableUnreachableBranchesRules: false
 		varTagType: false

conf/parametersSchema.neon

@@ -56,7 +56,6 @@ parametersSchema:
 		duplicateStubs: bool()
 		logicalXor: bool()
 		betterNoop: bool()
-		invarianceComposition: bool()
 		alwaysTrueAlwaysReported: bool()
 		disableUnreachableBranchesRules: bool()
 		varTagType: bool()

src/DependencyInjection/ContainerFactory.php

@@ -31,7 +31,6 @@
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Reflection\ReflectionProviderStaticAccessor;
 use PHPStan\ShouldNotHappenException;
-use PHPStan\Type\Generic\TemplateTypeVariance;
 use PHPStan\Type\ObjectType;
 use Symfony\Component\Finder\Finder;
 use function array_diff_key;
@@ -191,7 +190,6 @@ public static function postInitializeContainer(Container $container): void
 		$container->getService('typeSpecifier');
 
 		BleedingEdgeToggle::setBleedingEdge($container->getParameter('featureToggles')['bleedingEdge']);
-		TemplateTypeVariance::setInvarianceCompositionEnabled($container->getParameter('featureToggles')['invarianceComposition']);
 	}
 
 	public function clearOldContainers(string $tempDirectory): void

src/Type/Generic/TemplateTypeVariance.php

@@ -28,8 +28,6 @@ class TemplateTypeVariance
 	/** @var self[] */
 	private static array $registry;
 
-	private static bool $invarianceCompositionEnabled = false;
-
 	private function __construct(private int $value)
 	{
 	}
@@ -118,7 +116,7 @@ public function compose(self $other): self
 			return self::createInvariant();
 		}
 
-		if (self::$invarianceCompositionEnabled && $this->invariant()) {
+		if ($this->invariant()) {
 			return self::createInvariant();
 		}
 
@@ -253,9 +251,4 @@ public static function __set_state(array $properties): self
 		return new self($properties['value']);
 	}
 
-	public static function setInvarianceCompositionEnabled(bool $enabled): void
-	{
-		self::$invarianceCompositionEnabled = $enabled;
-	}
-
 }