minor symfony#51241 [FrameworkBundle] Remove obsolete feature detection from cache warmers (derrabus)

nicolas-grekas · nicolas-grekas · commit 3c9bf284e21a · 2023-08-03T11:07:51.000+02:00
This PR was merged into the 6.4 branch. Discussion ---------- [FrameworkBundle] Remove obsolete feature detection from cache warmers | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | N/A | License | MIT | Doc PR | N/A The features that those cache warmer access have existed since Symfony 4 or earlier. Let's remove the detection logic. Commits ------- fc3a0ca [FrameworkBundle] Remove obsolete feature detection from cache warmers
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php
@@ -41,8 +41,8 @@ public function __construct(array $loaders, string $phpArrayFile)
 
     protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter): bool
     {
-        if (!class_exists(CacheClassMetadataFactory::class) || !method_exists(XmlFileLoader::class, 'getMappedClasses') || !method_exists(YamlFileLoader::class, 'getMappedClasses')) {
-            return false;
+        if (!$this->loaders) {
+            return true;
         }
 
         $metadataFactory = new CacheClassMetadataFactory(new ClassMetadataFactory(new LoaderChain($this->loaders)), $arrayAdapter);
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
@@ -41,10 +41,6 @@ public function __construct(ValidatorBuilder $validatorBuilder, string $phpArray
 
     protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter): bool
     {
-        if (!method_exists($this->validatorBuilder, 'getLoaders')) {
-            return false;
-        }
-
         $loaders = $this->validatorBuilder->getLoaders();
         $metadataFactory = new LazyLoadingMetadataFactory(new LoaderChain($loaders), $arrayAdapter);
 

Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ public function __construct(array $loaders, string $phpArrayFile)`
`41`	`41`
`42`	`42`	`protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter): bool`
`43`	`43`	`{`
`44`		`- if (!class_exists(CacheClassMetadataFactory::class) \|\| !method_exists(XmlFileLoader::class, 'getMappedClasses') \|\| !method_exists(YamlFileLoader::class, 'getMappedClasses')) {`
`45`		`- return false;`
	`44`	`+ if (!$this->loaders) {`
	`45`	`+ return true;`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`$metadataFactory = new CacheClassMetadataFactory(new ClassMetadataFactory(new LoaderChain($this->loaders)), $arrayAdapter);`
Original file line number	Diff line number	Diff line change
`@@ -41,10 +41,6 @@ public function __construct(ValidatorBuilder $validatorBuilder, string $phpArray`
`41`	`41`
`42`	`42`	`protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter): bool`
`43`	`43`	`{`
`44`		`- if (!method_exists($this->validatorBuilder, 'getLoaders')) {`
`45`		`- return false;`
`46`		`- }`
`47`		`-`
`48`	`44`	`$loaders = $this->validatorBuilder->getLoaders();`
`49`	`45`	`$metadataFactory = new LazyLoadingMetadataFactory(new LoaderChain($loaders), $arrayAdapter);`
`50`	`46`