8000 simplify · symfony/symfony@8ab2ad6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8ab2ad6

Browse files
dmaicherdmaicher
committed
simplify
1 parent 44ffbf5 commit 8ab2ad6

File tree

4 files changed

+10
-19
lines changed

4 files changed

+10
-19
lines changed

‎src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,7 @@ public function warmUp($cacheDir)
5757

5858
spl_autoload_register(array($phpArrayAdapter, 'throwOnRequiredClass'));
5959
try {
60-
if (false === $this->doWarmUp($cacheDir, $phpArrayAdapter, $arrayAdapter)) {
61-
return;
62-
}
60+
$this->doWarmUp($cacheDir, $arrayAdapter);
6361
} finally {
6462
spl_autoload_unregister(array($phpArrayAdapter, 'throwOnRequiredClass'));
6563
}
@@ -83,11 +81,8 @@ protected function warmUpPhpArrayAdapter(PhpArrayAdapter $phpArrayAdapter, array
8381
}
8482

8583
/**
86-
* @param string $cacheDir
87-
* @param PhpArrayAdapter $phpArrayAdapter
88-
* @param ArrayAdapter $arrayAdapter
89-
*
90-
* @return bool|void false if there is nothing to warm-up
84+
* @param string $cacheDir
85+
* @param ArrayAdapter $arrayAdapter
9186
*/
92-
abstract protected function doWarmUp($cacheDir, PhpArrayAdapter $phpArrayAdapter, ArrayAdapter $arrayAdapter);
87+
abstract protected function doWarmUp($cacheDir, ArrayAdapter $arrayAdapter);
9388
}

‎src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use Doctrine\Common\Annotations\Reader;
1717
use Psr\Cache\CacheItemPoolInterface;
1818
use Symfony\Component\Cache\Adapter\ArrayAdapter;
19-
use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
2019
use Symfony\Component\Cache\DoctrineProvider;
2120

2221
/**
@@ -43,14 +42,12 @@ public function __construct(Reader $annotationReader, $phpArrayFile, CacheItemPo
4342
/**
4443
* {@inheritdoc}
4544
*/
46-
protected function doWarmUp($cacheDir, PhpArrayAdapter $phpArrayAdapter, ArrayAdapter $arrayAdapter)
45+
protected function doWarmUp($cacheDir, ArrayAdapter $arrayAdapter)
4746
{
4847
$annotatedClassPatterns = $cacheDir.'/annotations.map';
4948

5049
if (!is_file($annotatedClassPatterns)) {
51-
$phpArrayAdapter->warmUp(array());
52-
53-
return false;
50+
return;
5451
}
5552

5653
$annotatedClasses = include $annotatedClassPatterns;

‎src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use Doctrine\Common\Annotations\AnnotationException;
1515
use Psr\Cache\CacheItemPoolInterface;
1616
use Symfony\Component\Cache\Adapter\ArrayAdapter;
17-
use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
1817
use Symfony\Component\Serializer\Mapping\Factory\CacheClassMetadataFactory;
1918
use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
2019
use Symfony\Component\Serializer\Mapping\Loader\LoaderChain;
@@ -45,10 +44,10 @@ public function __construct(array $loaders, $phpArrayFile, CacheItemPoolInterfac
4544
/**
4645
* {@inheritdoc}
4746
*/
48-
protected function doWarmUp($cacheDir, PhpArrayAdapter $phpArrayAdapter, ArrayAdapter $arrayAdapter)
47+
protected function doWarmUp($cacheDir, ArrayAdapter $arrayAdapter)
4948
{
5049
if (!class_exists(CacheClassMetadataFactory::class) || !method_exists(XmlFileLoader::class, 'getMappedClasses') || !method_exists(YamlFileLoader::class, 'getMappedClasses')) {
51-
return false;
50+
return;
5251
}
5352

5453
$metadataFactory = new CacheClassMetadataFactory(new ClassMetadataFactory(new LoaderChain($this->loaders)), $arrayAdapter);

‎src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ public function __construct(ValidatorBuilderInterface $validatorBuilder, $phpArr
4646
/**
4747
* {@inheritdoc}
4848
*/
49-
protected function doWarmUp($cacheDir, PhpArrayAdapter $phpArrayAdapter, ArrayAdapter $arrayAdapter)
49+
protected function doWarmUp($cacheDir, ArrayAdapter $arrayAdapter)
5050
{
5151
if (!method_exists($this->validatorBuilder, 'getLoaders')) {
52-
return false;
52+
return;
5353
}
5454

5555
$loaders = $this->validatorBuilder->getLoaders();

0 commit comments

Comments
 (0)
0