Skip to content

Commit

Permalink
Merge branch '4.4'
Browse files Browse the repository at this point in the history
* 4.4:
  cs fix
  Partially Revert "Remove trailing space in all markdown files"
  [Intl] Explicit check
  Fix getMaxFilesize() returning zero
  Remove unused import
  [DI] fix docblocks in Container*
  Fixed markdown file
  [HttpFoundation] Fix deprecation message in ::isMethodSafe()
  [TwigBridge] Replaced plain doc block copies with inheritdoc.
  [DomCrawler] Fixed CHANGELOG markup
  [Intl] Cleanup unused language aliases entry
  • Loading branch information
nicolas-grekas committed Aug 14, 2019
2 parents 884c977 + a4025f5 commit ae86b63
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 17 deletions.
4 changes: 1 addition & 3 deletions Extension/RoutingExtension.php
Expand Up @@ -33,9 +33,7 @@ public function __construct(UrlGeneratorInterface $generator)
}

/**
* Returns a list of functions to add to the existing list.
*
* @return array An array of functions
* {@inheritdoc}
*/
public function getFunctions()
{
Expand Down
8 changes: 2 additions & 6 deletions TokenParser/TransDefaultDomainTokenParser.php
Expand Up @@ -24,9 +24,7 @@
class TransDefaultDomainTokenParser extends AbstractTokenParser
{
/**
* Parses a token and returns a node.
*
* @return Node
* {@inheritdoc}
*/
public function parse(Token $token)
{
Expand All @@ -38,9 +36,7 @@ public function parse(Token $token)
}

/**
* Gets the tag name associated with this token parser.
*
* @return string The tag name
* {@inheritdoc}
*/
public function getTag()
{
Expand Down
10 changes: 2 additions & 8 deletions TokenParser/TransTokenParser.php
Expand Up @@ -28,11 +28,7 @@
class TransTokenParser extends AbstractTokenParser
{
/**
* Parses a token and returns a node.
*
* @return Node
*
* @throws SyntaxError
* {@inheritdoc}
*/
public function parse(Token $token)
{
Expand Down Expand Up @@ -90,9 +86,7 @@ public function decideTransFork(Token $token)
}

/**
* Gets the tag name associated with this token parser.
*
* @return string The tag name
* {@inheritdoc}
*/
public function getTag()
{
Expand Down

0 comments on commit ae86b63

Please sign in to comment.