[FrameworkBundle] Fix BrowserKit assertions to make them compatible with Panther

dunglas · dunglas · commit 2316dc36fba0 · 2019-08-21T14:46:38.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestAssertionsTrait.php b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestAssertionsTrait.php
@@ -13,7 +13,7 @@
 
 use PHPUnit\Framework\Constraint\LogicalAnd;
 use PHPUnit\Framework\Constraint\LogicalNot;
-use Symfony\Bundle\FrameworkBundle\KernelBrowser;
+use Symfony\Component\BrowserKit\AbstractBrowser;
 use Symfony\Component\BrowserKit\Test\Constraint as BrowserKitConstraint;
 use Symfony\Component\DomCrawler\Crawler;
 use Symfony\Component\DomCrawler\Test\Constraint as DomCrawlerConstraint;
@@ -186,15 +186,15 @@ public static function assertRouteSame($expectedRoute, array $parameters = [], s
         self::assertThat(self::getRequest(), $constraint, $message);
     }
 
-    private static function getClient(KernelBrowser $newClient = null): ?KernelBrowser
+    private static function getClient(AbstractBrowser $newClient = null): ?AbstractBrowser
     {
         static $client;
 
         if (0 < \func_num_args()) {
             return $client = $newClient;
         }
 
-        if (!$client instanceof KernelBrowser) {
+        if (!$client instanceof AbstractBrowser) {
             static::fail(sprintf('A client must be set to make assertions on it. Did you forget to call "%s::createClient()"?', __CLASS__));
         }
 
diff --git a/src/Symfony/Component/DomCrawler/Test/Constraint/CrawlerSelectorAttributeValueSame.php b/src/Symfony/Component/DomCrawler/Test/Constraint/CrawlerSelectorAttributeValueSame.php
@@ -47,7 +47,7 @@ protected function matches($crawler): bool
             return false;
         }
 
-        return $this->expectedText === trim($crawler->getNode(0)->getAttribute($this->attribute));
+        return $this->expectedText === trim($crawler->attr($this->attribute));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\Constraint\LogicalAnd;`
`15`	`15`	`use PHPUnit\Framework\Constraint\LogicalNot;`
`16`		`-use Symfony\Bundle\FrameworkBundle\KernelBrowser;`
	`16`	`+use Symfony\Component\BrowserKit\AbstractBrowser;`
`17`	`17`	`use Symfony\Component\BrowserKit\Test\Constraint as BrowserKitConstraint;`
`18`	`18`	`use Symfony\Component\DomCrawler\Crawler;`
`19`	`19`	`use Symfony\Component\DomCrawler\Test\Constraint as DomCrawlerConstraint;`
`@@ -186,15 +186,15 @@ public static function assertRouteSame($expectedRoute, array $parameters = [], s`
`186`	`186`	`self::assertThat(self::getRequest(), $constraint, $message);`
`187`	`187`	`}`
`188`	`188`
`189`		`- private static function getClient(KernelBrowser $newClient = null): ?KernelBrowser`
	`189`	`+ private static function getClient(AbstractBrowser $newClient = null): ?AbstractBrowser`
`190`	`190`	`{`
`191`	`191`	`static $client;`
`192`	`192`
`193`	`193`	`if (0 < \func_num_args()) {`
`194`	`194`	`return $client = $newClient;`
`195`	`195`	`}`
`196`	`196`
`197`		`- if (!$client instanceof KernelBrowser) {`
	`197`	`+ if (!$client instanceof AbstractBrowser) {`
`198`	`198`	`static::fail(sprintf('A client must be set to make assertions on it. Did you forget to call "%s::createClient()"?', __CLASS__));`
`199`	`199`	`}`
`200`	`200`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ protected function matches($crawler): bool`
`47`	`47`	`return false;`
`48`	`48`	`}`
`49`	`49`
`50`		`- return $this->expectedText === trim($crawler->getNode(0)->getAttribute($this->attribute));`
	`50`	`+ return $this->expectedText === trim($crawler->attr($this->attribute));`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/**`