Merge branch '3.x'

This commit is contained in:
Guilhem Niot 2020-12-10 22:31:50 +01:00
commit 909a7934b4
3 changed files with 5 additions and 3 deletions

View File

@ -111,7 +111,7 @@ final class FilteredRouteCollectionBuilder
} }
} }
return 0 === count($this->options['name_patterns']); return 0 === count($this->options['name_patterns']);
} }
private function matchAnnotation(Route $route): bool private function matchAnnotation(Route $route): bool

View File

@ -18,5 +18,7 @@ class Bar
{ {
public $things; public $things;
public function addThing(array $thing) { } public function addThing(array $thing)
{
}
} }

View File

@ -255,6 +255,6 @@ class FilteredRouteCollectionBuilderTest extends TestCase
); );
} }
return new ControllerReflector(new Container()); return new ControllerReflector(new Container());
} }
} }