Skip to content

Commit cdd298b

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: removed dots at the end of @param and @return fixed typo
2 parents fa73175 + 8b64559 commit cdd298b

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Annotation/Route.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class Route
3434
/**
3535
* Constructor.
3636
*
37-
* @param array $data An array of key/value parameters.
37+
* @param array $data An array of key/value parameters
3838
*
3939
* @throws \BadMethodCallException
4040
*/

Loader/XmlFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ protected function loadFile($file)
219219
* @param \DOMElement $node Element to parse that contains the configs
220220
* @param string $path Full path of the XML file being processed
221221
*
222-
* @return array An array with the defaults as first item, requirements as second and options as third.
222+
* @return array An array with the defaults as first item, requirements as second and options as third
223223
*
224224
* @throws \InvalidArgumentException When the XML is invalid
225225
*/

Matcher/RedirectableUrlMatcherInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ interface RedirectableUrlMatcherInterface
2121
/**
2222
* Redirects the user to another URL.
2323
*
24-
* @param string $path The path info to redirect to.
24+
* @param string $path The path info to redirect to
2525
* @param string $route The route name that matched
2626
* @param string|null $scheme The URL scheme (null to keep the current one)
2727
*

Router.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ public function getContext()
219219
/**
220220
* Sets the ConfigCache factory to use.
221221
*
222-
* @param ConfigCacheFactoryInterface $configCacheFactory The factory to use.
222+
* @param ConfigCacheFactoryInterface $configCacheFactory The factory to use
223223
*/
224224
public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFactory)
225225
{

0 commit comments

Comments
 (0)