Skip to content

Commit e57bc21

Browse files
committed
Merge branch '3.3' into 3.4
* 3.3: [CS] Apply phpdoc_annotation_without_dot bumped Symfony version to 3.3.10 updated VERSION for 3.3.9 updated CHANGELOG for 3.3.9 [DomCrawler] Fix conversion to int on GetPhpFiles Remove `protected_to_private` rule. Filtering empty uuids in ORMQueryBuilderLoader.
2 parents a7dbe78 + 0047b27 commit e57bc21

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Loader/XmlFileLoader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ class XmlFileLoader extends FileLoader
3636
*
3737
* @return RouteCollection A RouteCollection instance
3838
*
39-
* @throws \InvalidArgumentException When the file cannot be loaded or when the XML cannot be
40-
* parsed because it does not validate against the scheme.
39+
* @throws \InvalidArgumentException when the file cannot be loaded or when the XML cannot be
40+
* parsed because it does not validate against the scheme
4141
*/
4242
public function load($file, $type = null)
4343
{

RouteCompiler.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ class RouteCompiler implements RouteCompilerInterface
3939
/**
4040
* {@inheritdoc}
4141
*
42-
* @throws \InvalidArgumentException If a path variable is named _fragment
43-
* @throws \LogicException If a variable is referenced more than once
44-
* @throws \DomainException If a variable name starts with a digit or if it is too long to be successfully used as
45-
* a PCRE subpattern.
42+
* @throws \InvalidArgumentException if a path variable is named _fragment
43+
* @throws \LogicException if a variable is referenced more than once
44+
* @throws \DomainException if a variable name starts with a digit or if it is too long to be successfully used as
45+
* a PCRE subpattern
4646
*/
4747
public static function compile(Route $route)
4848
{

0 commit comments

Comments
 (0)