Skip to content

Commit 1126fa6

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.4'
* 4.4: remove deprecated cache pool arguments
2 parents fd9e512 + 700167e commit 1126fa6

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public function testClassAutoloadException()
8181
$this->assertFalse(class_exists($annotatedClass = 'C\C\C', false));
8282

8383
file_put_contents($this->cacheDir.'/annotations.map', sprintf('<?php return %s;', var_export([$annotatedClass], true)));
84-
$warmer = new AnnotationsCacheWarmer(new AnnotationReader(), tempnam($this->cacheDir, __FUNCTION__), new ArrayAdapter());
84+
$warmer = new AnnotationsCacheWarmer(new AnnotationReader(), tempnam($this->cacheDir, __FUNCTION__));
8585

8686
spl_autoload_register($classLoader = function ($class) use ($annotatedClass) {
8787
if ($class === $annotatedClass) {
@@ -106,7 +106,7 @@ public function testClassAutoloadExceptionWithUnrelatedException()
106106
$this->assertFalse(class_exists($annotatedClass = 'AClassThatDoesNotExist_FWB_CacheWarmer_AnnotationsCacheWarmerTest', false));
107107

108108
file_put_contents($this->cacheDir.'/annotations.map', sprintf('<?php return %s;', var_export([$annotatedClass], true)));
109-
$warmer = new AnnotationsCacheWarmer(new AnnotationReader(), tempnam($this->cacheDir, __FUNCTION__), new ArrayAdapter());
109+
$warmer = new AnnotationsCacheWarmer(new AnnotationReader(), tempnam($this->cacheDir, __FUNCTION__));
110110

111111
spl_autoload_register($classLoader = function ($class) use ($annotatedClass) {
112112
if ($class === $annotatedClass) {

‎src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/SerializerCacheWarmerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function testClassAutoloadException()
6464

6565
$this->assertFalse(class_exists($mappedClass = 'AClassThatDoesNotExist_FWB_CacheWarmer_SerializerCacheWarmerTest', false));
6666

67-
$warmer = new SerializerCacheWarmer([new YamlFileLoader(__DIR__.'/../Fixtures/Serialization/Resources/does_not_exist.yaml')], tempnam(sys_get_temp_dir(), __FUNCTION__), new ArrayAdapter());
67+
$warmer = new SerializerCacheWarmer([new YamlFileLoader(__DIR__.'/../Fixtures/Serialization/Resources/does_not_exist.yaml')], tempnam(sys_get_temp_dir(), __FUNCTION__));
6868

6969
spl_autoload_register($classLoader = function ($class) use ($mappedClass) {
7070
if ($class === $mappedClass) {
@@ -92,7 +92,7 @@ public function testClassAutoloadExceptionWithUnrelatedException()
9292

9393
$this->assertFalse(class_exists($mappedClass = 'AClassThatDoesNotExist_FWB_CacheWarmer_SerializerCacheWarmerTest', false));
9494

95-
$warmer = new SerializerCacheWarmer([new YamlFileLoader(__DIR__.'/../Fixtures/Serialization/Resources/does_not_exist.yaml')], tempnam(sys_get_temp_dir(), __FUNCTION__), new ArrayAdapter());
95+
$warmer = new SerializerCacheWarmer([new YamlFileLoader(__DIR__.'/../Fixtures/Serialization/Resources/does_not_exist.yaml')], tempnam(sys_get_temp_dir(), __FUNCTION__));
9696

9797
spl_autoload_register($classLoader = function ($class) use ($mappedClass) {
9898
if ($class === $mappedClass) {

‎src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/ValidatorCacheWarmerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public function testClassAutoloadException()
9292

9393
$validatorBuilder = new ValidatorBuilder();
9494
$validatorBuilder->addYamlMapping(__DIR__.'/../Fixtures/Validation/Resources/does_not_exist.yaml');
95-
$warmer = new ValidatorCacheWarmer($validatorBuilder, tempnam(sys_get_temp_dir(), __FUNCTION__), new ArrayAdapter());
95+
$warmer = new ValidatorCacheWarmer($validatorBuilder, tempnam(sys_get_temp_dir(), __FUNCTION__));
9696

9797
spl_autoload_register($classloader = function ($class) use ($mappedClass) {
9898
if ($class === $mappedClass) {
@@ -118,7 +118,7 @@ public function testClassAutoloadExceptionWithUnrelatedException()
118118

119119
$validatorBuilder = new ValidatorBuilder();
120120
$validatorBuilder->addYamlMapping(__DIR__.'/../Fixtures/Validation/Resources/does_not_exist.yaml');
121-
$warmer = new ValidatorCacheWarmer($validatorBuilder, tempnam(sys_get_temp_dir(), __FUNCTION__), new ArrayAdapter());
121+
$warmer = new ValidatorCacheWarmer($validatorBuilder, tempnam(sys_get_temp_dir(), __FUNCTION__));
122122

123123
spl_autoload_register($classLoader = function ($class) use ($mappedClass) {
124124
if ($class === $mappedClass) {

0 commit comments

Comments
 (0)