Merge branch '7.4' into 8.0

* 7.4: (21 commits)
  [ObjectMapper] lazy loading
  [Filesystem] Unify logic for isAbsolute() in Path
  [DependencyInjection] Include return type in AppReference shape
  [Finder] Make method calls explicit in ExcludeDirectoryFilterIterator
  [Cache] Remove unset call on undefined variable in PhpArrayAdapter
  [Twig] Ensure WrappedTemplatedEmail::getReturnPath() returns a string
  [Routing] Simplify importing routes defined on controller services
  Fix tests
  [DependendcyInjection] Improve shape for "from_callable" definitions
  [PHPDoc] Fix various PHPDoc syntax errors
  [Console] Add missing VERBOSITY_SILENT case in CommandDataCollector
  [Notifier] Remove unused $transportName argument in EmailChannel::notify()
  [Translation] Remove an unused argument passed to parseNode() method
  [HttpClient] Reject 3xx pushed responses
  [Serializer] Use Asia/Tokyo instead of Japan in tests
  [ProxyManagerBridge] Remove comment that reference github discussion
  [JsonPath] Remove unused "nothing" property from JsonCrawler
  [ErrorHandler] Improve PHPDoc precision in SerializerErrorRenderer
  [Routing] Fix matching the "0" URL
  [Form] Fix EnumType choice_label logic for grouped choices
  ...

Author: nicolas-grekas

Loader/AttributeServicesLoader.php

@@ -42,6 +42,6 @@ public function load(mixed $resource, ?string $type = null): RouteCollection
 
     public function supports(mixed $resource, ?string $type = null): bool
     {
-        return 'tagged_services' === $type && 'attributes' === $resource;
+        return 'routing.controllers' === $resource;
     }
 }

Loader/Configurator/RoutesReference.php

@@ -26,8 +26,7 @@
  *
  *     return Routes::config([
  *         'controllers' => [
- *             'resource' => 'attributes',
- *             'type' => 'tagged_services',
+ *             'resource' => 'routing.controllers',
  *         ],
  *     ]);
  *     ```

Matcher/Dumper/CompiledUrlMatcherTrait.php

@@ -57,7 +57,7 @@ public function match(string $pathinfo): array
             } finally {
                 $this->context->setScheme($scheme);
             }
-        } elseif ('/' !== $trimmedPathinfo = rtrim($pathinfo, '/') ?: '/') {
+        } elseif ('' !== $trimmedPathinfo = rtrim($pathinfo, '/')) {
             $pathinfo = $trimmedPathinfo === $pathinfo ? $pathinfo.'/' : $trimmedPathinfo;
             if ($ret = $this->doMatch($pathinfo, $allow, $allowSchemes)) {
                 return $this->redirect($pathinfo, $ret['_route']) + $ret;
@@ -73,8 +73,8 @@ public function match(string $pathinfo): array
     private function doMatch(string $pathinfo, array &$allow = [], array &$allowSchemes = []): array
     {
         $allow = $allowSchemes = [];
-        $pathinfo = rawurldecode($pathinfo) ?: '/';
-        $trimmedPathinfo = rtrim($pathinfo, '/') ?: '/';
+        $pathinfo = '' === ($pathinfo = rawurldecode($pathinfo)) ? '/' : $pathinfo;
+        $trimmedPathinfo = '' === ($trimmedPathinfo = rtrim($pathinfo, '/')) ? '/' : $trimmedPathinfo;
         $context = $this->context;
         $requestMethod = $canonicalMethod = $context->getMethod();
 

Matcher/RedirectableUrlMatcher.php

@@ -41,7 +41,7 @@ public function match(string $pathinfo): array
                 } finally {
                     $this->context->setScheme($scheme);
                 }
-            } elseif ('/' === $trimmedPathinfo = rtrim($pathinfo, '/') ?: '/') {
+            } elseif ('' === $trimmedPathinfo = rtrim($pathinfo, '/')) {
                 throw $e;
             } else {
                 try {

Matcher/TraceableUrlMatcher.php

@@ -57,7 +57,7 @@ protected function matchCollection(string $pathinfo, RouteCollection $routes): a
             $method = 'GET';
         }
         $supportsTrailingSlash = 'GET' === $method && $this instanceof RedirectableUrlMatcherInterface;
-        $trimmedPathinfo = rtrim($pathinfo, '/') ?: '/';
+        $trimmedPathinfo = '' === ($trimmedPathinfo = rtrim($pathinfo, '/')) ? '/' : $trimmedPathinfo;
 
         foreach ($routes as $name => $route) {
             $compiledRoute = $route->compile();

Matcher/UrlMatcher.php

@@ -70,8 +70,9 @@ public function getContext(): RequestContext
     public function match(string $pathinfo): array
     {
         $this->allow = $this->allowSchemes = [];
+        $pathinfo = '' === ($pathinfo = rawurldecode($pathinfo)) ? '/' : $pathinfo;
 
-        if ($ret = $this->matchCollection(rawurldecode($pathinfo) ?: '/', $this->routes)) {
+        if ($ret = $this->matchCollection($pathinfo, $this->routes)) {
             return $ret;
         }
 
@@ -114,7 +115,7 @@ protected function matchCollection(string $pathinfo, RouteCollection $routes): a
             $method = 'GET';
         }
         $supportsTrailingSlash = 'GET' === $method && $this instanceof RedirectableUrlMatcherInterface;
-        $trimmedPathinfo = rtrim($pathinfo, '/') ?: '/';
+        $trimmedPathinfo = '' === ($trimmedPathinfo = rtrim($pathinfo, '/')) ? '/' : $trimmedPathinfo;
 
         foreach ($routes as $name => $route) {
             $compiledRoute = $route->compile();

Tests/Loader/AttributeServicesLoaderTest.php

@@ -26,8 +26,8 @@ public function testSupports()
 
         $this->assertFalse($loader->supports('attributes', null));
         $this->assertFalse($loader->supports('attributes', 'attribute'));
-        $this->assertFalse($loader->supports('other', 'tagged_services'));
-        $this->assertTrue($loader->supports('attributes', 'tagged_services'));
+        $this->assertFalse($loader->supports('other', 'routing.controllers'));
+        $this->assertTrue($loader->supports('routing.controllers'));
     }
 
     public function testDelegatesToAttributeLoaderAndMergesCollections()
@@ -47,7 +47,7 @@ public function testDelegatesToAttributeLoaderAndMergesCollections()
         $attributeLoader->setResolver($resolver);
         $servicesLoader->setResolver($resolver);
 
-        $collection = $servicesLoader->load('attributes', 'tagged_services');
+        $collection = $servicesLoader->load('routing.controllers');
 
         $this->assertArrayHasKey('action', $collection->all());
         $this->assertArrayHasKey('put', $collection->all());

Tests/Matcher/UrlMatcherTest.php

@@ -22,6 +22,17 @@
 
 class UrlMatcherTest extends TestCase
 {
+    public function testZero()
+    {
+        $coll = new RouteCollection();
+        $coll->add('index', new Route('/'));
+
+        $matcher = $this->getUrlMatcher($coll);
+
+        $this->expectException(ResourceNotFoundException::class);
+        $matcher->match('0');
+    }
+
     public function testNoMethodSoAllowed()
     {
         $coll = new RouteCollection();