Merge pull request #2 from Codeception/symfony5

Naktibalda · web-flow · commit 170c66cb30b1 · 2019-11-24T18:16:11.000+02:00
Compatibility with Symfony 5
diff --git a/composer.json b/composer.json
@@ -20,8 +20,8 @@
     "require": {
         "php": ">=5.6.0 <8.0",
         "codeception/codeception": "*@dev",
-        "symfony/browser-kit": ">=2.7 <5.0",
-        "symfony/dom-crawler": ">=2.7 <5.0"
+        "symfony/browser-kit": ">=2.7 <6.0",
+        "symfony/dom-crawler": ">=2.7 <6.0"
     },
     "require-dev": {
         "codeception/util-universalframework": "dev-master"
diff --git a/src/Codeception/Lib/InnerBrowser.php b/src/Codeception/Lib/InnerBrowser.php
@@ -557,15 +557,18 @@ public function seeLink($text, $url = null)
         $this->assertTrue(true);
     }
 
-    public function dontSeeLink($text, $url = null)
+    public function dontSeeLink($text, $url = '')
     {
         $crawler = $this->getCrawler()->selectLink($text);
         if (!$url) {
             if ($crawler->count() > 0) {
                 $this->fail("Link containing text '$text' was found in page " . $this->_getCurrentUri());
             }
         }
-        $crawler = $crawler->filterXPath(sprintf('.//a[substring(@href, string-length(@href) - string-length(%1$s) + 1)=%1$s]', Crawler::xpathLiteral($url)));
+        $crawler = $crawler->filterXPath(
+            sprintf('.//a[substring(@href, string-length(@href) - string-length(%1$s) + 1)=%1$s]',
+            Crawler::xpathLiteral($url))
+        );
         if ($crawler->count() > 0) {
             $this->fail("Link containing text '$text' and URL '$url' was found in page " . $this->_getCurrentUri());
         }

Original file line number	Diff line number	Diff line change
`@@ -557,15 +557,18 @@ public function seeLink($text, $url = null)`
`557`	`557`	`$this->assertTrue(true);`
`558`	`558`	`}`
`559`	`559`
`560`		`- public function dontSeeLink($text, $url = null)`
	`560`	`+ public function dontSeeLink($text, $url = '')`
`561`	`561`	`{`
`562`	`562`	`$crawler = $this->getCrawler()->selectLink($text);`
`563`	`563`	`if (!$url) {`
`564`	`564`	`if ($crawler->count() > 0) {`
`565`	`565`	`$this->fail("Link containing text '$text' was found in page " . $this->_getCurrentUri());`
`566`	`566`	`}`
`567`	`567`	`}`
`568`		`- $crawler = $crawler->filterXPath(sprintf('.//a[substring(@href, string-length(@href) - string-length(%1$s) + 1)=%1$s]', Crawler::xpathLiteral($url)));`
	`568`	`+ $crawler = $crawler->filterXPath(`
	`569`	`+ sprintf('.//a[substring(@href, string-length(@href) - string-length(%1$s) + 1)=%1$s]',`
	`570`	`+ Crawler::xpathLiteral($url))`
	`571`	`+ );`
`569`	`572`	`if ($crawler->count() > 0) {`
`570`	`573`	`$this->fail("Link containing text '$text' and URL '$url' was found in page " . $this->_getCurrentUri());`
`571`	`574`	`}`