Skip to content

Commit 8b3bb77

Browse files
Merge branch '5.0'
* 5.0: (27 commits) 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 missing gitattributes for phpunit-bridge add German translations Bump Symfony version to 5.0.7 Update VERSION for 5.0.6 Update CHANGELOG for 5.0.6 ...
2 parents 5d5d9ef + 892311d commit 8b3bb77

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/Tests export-ignore
22
/phpunit.xml.dist export-ignore
3+
/.gitattributes export-ignore
34
/.gitignore export-ignore

Test/Constraint/CrawlerSelectorTextContains.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ protected function matches($crawler): bool
4545
return false;
4646
}
4747

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

5151
/**

Test/Constraint/CrawlerSelectorTextSame.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ protected function matches($crawler): bool
4545
return false;
4646
}
4747

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

5151
/**

0 commit comments

Comments
 (0)