Skip to content

Commit 9def98b

Browse files
Merge branch '6.2' into 6.3
* 6.2: CS fix Fix test provider
2 parents ca5f274 + fa643fa commit 9def98b

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

Loader/XmlFileLoader.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ public function load(mixed $file, string $type = null): RouteCollection
6262
/**
6363
* Parses a node from a loaded XML file.
6464
*
65-
* @throws \InvalidArgumentException When the XML is invalid
66-
*
6765
* @return void
66+
*
67+
* @throws \InvalidArgumentException When the XML is invalid
6868
*/
6969
protected function parseNode(RouteCollection $collection, \DOMElement $node, string $path, string $file)
7070
{
@@ -102,9 +102,9 @@ public function supports(mixed $resource, string $type = null): bool
102102
/**
103103
* Parses a route and adds it to the RouteCollection.
104104
*
105-
* @throws \InvalidArgumentException When the XML is invalid
106-
*
107105
* @return void
106+
*
107+
* @throws \InvalidArgumentException When the XML is invalid
108108
*/
109109
protected function parseRoute(RouteCollection $collection, \DOMElement $node, string $path)
110110
{
@@ -151,9 +151,9 @@ protected function parseRoute(RouteCollection $collection, \DOMElement $node, st
151151
/**
152152
* Parses an import and adds the routes in the resource to the RouteCollection.
153153
*
154-
* @throws \InvalidArgumentException When the XML is invalid
155-
*
156154
* @return void
155+
*
156+
* @throws \InvalidArgumentException When the XML is invalid
157157
*/
158158
protected function parseImport(RouteCollection $collection, \DOMElement $node, string $path, string $file)
159159
{

Loader/YamlFileLoader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,10 +242,10 @@ protected function parseImport(RouteCollection $collection, array $config, strin
242242
}
243243

244244
/**
245+
* @return void
246+
*
245247
* @throws \InvalidArgumentException If one of the provided config keys is not supported,
246248
* something is missing or the combination is nonsense
247-
*
248-
* @return void
249249
*/
250250
protected function validate(mixed $config, string $name, string $path)
251251
{

Router.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ public function __construct(LoaderInterface $loader, mixed $resource, array $opt
116116
* * strict_requirements: Configure strict requirement checking for generators
117117
* implementing ConfigurableRequirementsInterface (default is true)
118118
*
119-
* @throws \InvalidArgumentException When unsupported option is provided
120-
*
121119
* @return void
120+
*
121+
* @throws \InvalidArgumentException When unsupported option is provided
122122
*/
123123
public function setOptions(array $options)
124124
{
@@ -151,9 +151,9 @@ public function setOptions(array $options)
151151
/**
152152
* Sets an option.
153153
*
154-
* @throws \InvalidArgumentException
155-
*
156154
* @return void
155+
*
156+
* @throws \InvalidArgumentException
157157
*/
158158
public function setOption(string $key, mixed $value)
159159
{

0 commit comments

Comments
 (0)