Fix #134: Don't add empty query string

src/UrlGenerator.php

@@ -254,7 +254,7 @@ private function missingArguments(array $parts, array $substitutions): array
             }
         }
 
-        // All required arguments are availgit logable.
+        // All required arguments are available.
         return [];
     }
 
@@ -297,10 +297,11 @@ private function generatePath(array $arguments, array $queryParameters, array $p
 
         $path = str_replace('//', '/', $path);
 
-        return $path . (
-            $notSubstitutedArguments !== [] || $queryParameters !== [] ?
-                '?' . http_build_query(array_merge($notSubstitutedArguments, $queryParameters))
-                : ''
-        );
+        $queryString = '';
+        if (!empty($notSubstitutedArguments) || !empty($queryParameters)) {
+            $queryString = http_build_query(array_merge($notSubstitutedArguments, $queryParameters));
+        }
+
+        return $path . (!empty($queryString) ? '?' . $queryString : '');
     }
 }

tests/UrlGeneratorTest.php

@@ -196,6 +196,19 @@ public function testQueryParametersAddedAsQueryString(): void
         $this->assertEquals('/test/post?id=12&sort=asc', $url);
     }
 
+    public function testQueryParametersAddedAsQueryStringWithEmptyValues(): void
+    {
+        $routes = [
+            Route::get('/test/{name}')
+                 ->name('test'),
+        ];
+
+        $url = $this
+            ->createUrlGenerator($routes)
+            ->generate('test', ['name' => 'post'], ['id' => null]);
+        $this->assertEquals('/test/post', $url);
+    }
+
     public function testExtraArgumentsAddedAsQueryString(): void
     {
         $routes = [
@@ -866,7 +879,7 @@ private function createRouteCollection(array $routes): RouteCollectionInterface
     {
         $rootGroup = Group::create()->routes(...$routes);
         $collector = new RouteCollector();
-        $collector->addGroup($rootGroup);
+        $collector->addRoute($rootGroup);
         return new RouteCollection($collector);
     }
 }

tests/UrlMatcherTest.php

@@ -491,7 +491,7 @@ private function createUrlMatcher(array $routes, CacheInterface $cache = null):
     {
         $rootGroup = Group::create()->routes(...$routes);
         $collector = new RouteCollector();
-        $collector->addGroup($rootGroup);
+        $collector->addRoute($rootGroup);
         return new UrlMatcher(new RouteCollection($collector), $cache, ['cache_key' => 'route-cache']);
     }
 }