10000 Remove dead code · symfony/symfony@57c1f24 · GitHub
[go: up one dir, main page]

Skip to content

Commit 57c1f24

Browse files
committed
Remove dead code
Signed-off-by: Alexander M. Turek <me@derrabus.de>
1 parent 873e71b commit 57c1f24

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection;
1313

1414
use Doctrine\Common\Annotations\Annotation;
15-
use Doctrine\Common\Annotations\PsrCachedReader;
1615
use Psr\Cache\CacheItemPoolInterface;
1716
use Psr\Log\LoggerAwareInterface;
1817
use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
@@ -1093,7 +1092,7 @@ public function testAnnotations()
10931092
$container->compile();
10941093

10951094
$this->assertEquals($container->getParameter('kernel.cache_dir').'/annotations', $container->getDefinition('annotations.filesystem_cache_adapter')->getArgument(2));
1096-
$this->assertSame(class_exists(PsrCachedReader::class) ? 'annotations.filesystem_cache_adapter' : 'annotations.filesystem_cache', (string) $container->getDefinition('annotation_reader')->getArgument(1));
1095+
$this->assertSame('annotations.filesystem_cache_adapter', (string) $container->getDefinition('annotation_reader')->getArgument(1));
10971096
}
10981097

10991098
public function testFileLinkFormat()

src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\Validator\Tests;
1313

14-
use Doctrine\Common\Annotations\CachedReader;
1514
use Doctrine\Common\Annotations\PsrCachedReader;
1615
use Doctrine\Common\Annotations\Reader;
1716
use PHPUnit\Framework\TestCase;
@@ -100,11 +99,7 @@ public function testEnableAnnotationMapping()
10099
$r = new \ReflectionProperty(AnnotationLoader::class, 'reader');
101100
$r->setAccessible(true);
102101

103-
if (class_exists(PsrCachedReader::class)) {
104-
$this->assertInstanceOf(PsrCachedReader::class, $r->getValue($loaders[0]));
105-
} else {
106-
$this->assertInstanceOf(CachedReader::class, $r->getValue($loaders[0]));
107-
}
102+
$this->assertInstanceOf(PsrCachedReader::class, $r->getValue($loaders[0]));
108103
}
109104

110105
public function testEnableAnnotationMappingWithDefaultDoctrineAnnotationReader()
@@ -119,11 +114,7 @@ public function testEnableAnnotationMappingWithDefaultDoctrineAnnotationReader()
119114
$r = new \ReflectionProperty(AnnotationLoader::class, 'reader');
120115
$r->setAccessible(true);
121116

122-
if (class_exists(PsrCachedReader::class)) {
123-
$this->assertInstanceOf(PsrCachedReader::class, $r->getValue($loaders[0]));
124-
} else {
125-
$this->assertInstanceOf(CachedReader::class, $r->getValue($loaders[0]));
126-
}
117+
$this->assertInstanceOf(PsrCachedReader::class, $r->getValue($loaders[0]));
127118
}
128119

129120
/**

0 commit comments

Comments
 (0)
0