Merge pull request #2057 from greg0ire/legacy-hunt

Cleanup occurrences of the word "legacy"

Author: greg0ire

src/DependencyInjection/DoctrineExtension.php

@@ -21,9 +21,7 @@
 use Doctrine\ORM\Events;
 use Doctrine\ORM\Id\AbstractIdGenerator;
 use Doctrine\ORM\Mapping\Driver\AttributeDriver;
-use Doctrine\ORM\Mapping\Driver\PHPDriver as LegacyPHPDriver;
 use Doctrine\ORM\Mapping\Driver\SimplifiedXmlDriver;
-use Doctrine\ORM\Mapping\Driver\StaticPHPDriver as LegacyStaticPHPDriver;
 use Doctrine\ORM\Mapping\Embeddable;
 use Doctrine\ORM\Mapping\Entity;
 use Doctrine\ORM\Mapping\MappedSuperclass;
@@ -1041,12 +1039,10 @@ protected function getMetadataDriverClass(string $driverType): string
                 return SimplifiedXmlDriver::class;
 
             case 'php':
-                /* @phpstan-ignore class.notFound */
-                return class_exists(PHPDriver::class) ? PHPDriver::class : LegacyPHPDriver::class;
+                return PHPDriver::class;
 
             case 'staticphp':
-                /* @phpstan-ignore class.notFound */
-                return class_exists(StaticPHPDriver::class) ? StaticPHPDriver::class : LegacyStaticPHPDriver::class;
+                return StaticPHPDriver::class;
 
             case 'attribute':
                 return AttributeDriver::class;

src/Twig/DoctrineExtension.php

@@ -141,7 +141,7 @@ public function formatSql(string $sql, bool $highlight): string
         return $this->sqlFormatter->format($sql);
     }
 
-    private function setUpSqlFormatter(bool $highlight = true, bool $legacy = false): void
+    private function setUpSqlFormatter(bool $highlight = true): void
     {
         $this->sqlFormatter = new SqlFormatter($highlight ? new HtmlHighlighter([
             HtmlHighlighter::HIGHLIGHT_PRE            => 'class="highlight highlight-sql"',
@@ -154,6 +154,6 @@ private function setUpSqlFormatter(bool $highlight = true, bool $legacy = false)
             HtmlHighlighter::HIGHLIGHT_ERROR          => 'class="error"',
             HtmlHighlighter::HIGHLIGHT_COMMENT        => 'class="comment"',
             HtmlHighlighter::HIGHLIGHT_VARIABLE       => 'class="variable"',
-        ], ! $legacy) : new NullHighlighter());
+        ]) : new NullHighlighter());
     }
 }