Skip to content

Commit

Permalink
Merge branch '4.4' into 5.0
Browse files Browse the repository at this point in the history
* 4.4:
  Fix versions
  [Security/Http] Allow setting cookie security settings for delete_cookies
  [DI] fix generating TypedReference from PriorityTaggedServiceTrait
  [FrameworkBundle] revert to legacy wiring of the session when circular refs are detected
  bumped Symfony version to 3.4.40
  updated VERSION for 3.4.39
  update CONTRIBUTORS for 3.4.39
  updated CHANGELOG for 3.4.39
  [DomCrawler] Fix BC break in assertions breaking Panther
  [BrowserKit] fixed missing post request parameters in file uploads
  update Italian translation
  [Validator] Add missing Hungarian translations
  [Validator] Add the missing translations for the Arabic (ar) locale
  [Validator] Add missing vietnamese translations
  [Console] Fix OutputStream for PHP 7.4
  add German translations
  bug #36157 [Validator] Assert Valid with many groups
  [Validator] Add missing Lithuanian translations
  Fixed some typos
  Add french "at least" constraint translations
  • Loading branch information
nicolas-grekas committed Mar 30, 2020
2 parents 9143787 + 4d0fb33 commit 892311d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Test/Constraint/CrawlerSelectorTextContains.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ protected function matches($crawler): bool
return false;
}

return false !== mb_strpos($crawler->text(null, false), $this->expectedText);
return false !== mb_strpos($crawler->text(null, true), $this->expectedText);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion Test/Constraint/CrawlerSelectorTextSame.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ protected function matches($crawler): bool
return false;
}

return $this->expectedText === trim($crawler->text(null, false));
return $this->expectedText === trim($crawler->text(null, true));
}

/**
Expand Down

0 comments on commit 892311d

Please sign in to comment.