[7.0] Cleanup legacy code paths

Author: nicolas-grekas

Loader/AttributeClassLoader.php

@@ -222,8 +222,10 @@ public function getResolver(): LoaderResolverInterface
 
     /**
      * Gets the default route name for a class method.
+     *
+     * @return string
      */
-    protected function getDefaultRouteName(\ReflectionClass $class, \ReflectionMethod $method): string
+    protected function getDefaultRouteName(\ReflectionClass $class, \ReflectionMethod $method)
     {
         $name = str_replace('\\', '_', $class->name).'_'.$method->name;
         $name = \function_exists('mb_strtolower') && preg_match('//u', $name) ? mb_strtolower($name, 'UTF-8') : strtolower($name);
@@ -319,7 +321,10 @@ protected function createRoute(string $path, array $defaults, array $requirement
         return new Route($path, $defaults, $requirements, $options, $host, $schemes, $methods, $condition);
     }
 
-    abstract protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot): void;
+    /**
+     * @return void
+     */
+    abstract protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot);
 
     /**
      * @return iterable<int, RouteAnnotation>

Loader/Psr4DirectoryLoader.php

@@ -48,7 +48,7 @@ public function load(mixed $resource, string $type = null): ?RouteCollection
 
     public function supports(mixed $resource, string $type = null): bool
     {
-        return ('attribute' === $type || 'annotation' === $type) && \is_array($resource) && isset($resource['path'], $resource['namespace']);
+        return 'attribute' === $type && \is_array($resource) && isset($resource['path'], $resource['namespace']);
     }
 
     public function forDirectory(string $currentDirectory): static

Tests/Loader/AttributeDirectoryLoaderTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Routing\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Routing\Loader\AttributeDirectoryLoader;
 use Symfony\Component\Routing\Tests\Fixtures\AttributedClasses\BarClass;
@@ -23,8 +22,6 @@
 
 class AttributeDirectoryLoaderTest extends TestCase
 {
-    use ExpectDeprecationTrait;
-
     private AttributeDirectoryLoader $loader;
     private TraceableAttributeClassLoader $classLoader;
 

Tests/Loader/AttributeFileLoaderTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Routing\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Routing\Loader\AttributeFileLoader;
 use Symfony\Component\Routing\Tests\Fixtures\AttributedClasses\FooClass;
@@ -29,8 +28,6 @@
 
 class AttributeFileLoaderTest extends TestCase
 {
-    use ExpectDeprecationTrait;
-
     private AttributeFileLoader $loader;
     private TraceableAttributeClassLoader $classLoader;