Merge pull request #225 from dunglas/fix-deprecations

Fix remaining deprecations

Author: dunglas

.travis.yml

@@ -30,6 +30,6 @@ install:
     fi
 
 script:
-  - vendor/bin/phpunit
+  - vendor/bin/simple-phpunit
   - if [[ $lint = '1' ]]; then php php-cs-fixer.phar fix --dry-run --diff --no-ansi; fi
   - if [[ $lint = '1' ]]; then php phpstan.phar analyse src tests --level=6; fi

CHANGELOG.md

@@ -7,6 +7,7 @@ CHANGELOG
 * Allow to override the `APP_ENV` environment variable passed to the web server by setting `PANTHER_APP_ENV`
 * Fix using assertions with a client created through `PantherTestCase::createClient()`
 * Don't call `PantherTestCase::getClient()` if this method isn't `static`
+* Fix remaining deprecations
 
 0.5.0
 -----

composer.json

@@ -20,6 +20,7 @@
     "php": ">=7.1",
     "facebook/webdriver": "^1.7.1",
     "symfony/browser-kit": "^4.3",
+    "symfony/dom-crawler": "^4.3",
     "symfony/http-client": "^4.3",
     "symfony/polyfill-php72": "^1.9",
     "symfony/process": "^3.4 || ^4.0"
@@ -39,10 +40,10 @@
     "sort-packages": true
   },
   "require-dev": {
-    "guzzlehttp/guzzle": "^6.3",
     "fabpot/goutte": "^3.2.3",
-    "phpunit/phpunit": "^7.3",
+    "guzzlehttp/guzzle": "^6.3",
     "symfony/css-selector": "^3.4 || ^4.0",
-    "symfony/framework-bundle": "^3.4 || ^4.0"
+    "symfony/framework-bundle": "^3.4 || ^4.0",
+    "symfony/phpunit-bridge": "^4.3.3"
   }
 }

phpstan.neon

@@ -1,4 +1,6 @@
 parameters:
+	autoload_files:
+		- vendor/bin/.phpunit/phpunit-7.4/vendor/autoload.php
 	inferPrivatePropertyTypeFromConstructor: true
 	ignoreErrors:
 		# https://github.com/symfony/symfony/pull/33289
@@ -11,6 +13,8 @@ parameters:
 		- '#Call to private static method getClient\(\) of class Symfony\\Bundle\\FrameworkBundle\\Test\\WebTestCase\.#'
 		- '#Call to an undefined static method Symfony\\Component\\Panther\\PantherTestCase::baseAssertPageTitleContains\(\)\.#'
 		- '#Call to an undefined static method Symfony\\Component\\Panther\\PantherTestCase::baseAssertPageTitleSame\(\)\.#'
+		- '#Call to function method_exists\(\) with #'
+		- '#Call to an undefined static method Symfony\\Component\\Panther\\PantherTestCase::assertStringContainsString\(\)\.#'
 		# To fix in PHP WebDriver
 		- '#Parameter \#2 \$desired_capabilities of static method Facebook\\WebDriver\\Remote\\RemoteWebDriver::create\(\) expects array\|Facebook\\WebDriver\\Remote\\DesiredCapabilities\|null, Facebook\\WebDriver\\WebDriverCapabilities given\.#'
 		# Require a redesign of the underlying Symfony components

phpunit.xml.dist

@@ -10,6 +10,7 @@
 
     <php>
         <env name="KERNEL_CLASS" value="Symfony\Component\Panther\Tests\DummyKernel" />
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[total]=1" />
     </php>
 
     <testsuites>

src/DomCrawler/Crawler.php

@@ -17,6 +17,7 @@
 use Facebook\WebDriver\WebDriver;
 use Facebook\WebDriver\WebDriverBy;
 use Facebook\WebDriver\WebDriverElement;
+use Symfony\Component\CssSelector\CssSelectorConverter;
 use Symfony\Component\DomCrawler\Crawler as BaseCrawler;
 use Symfony\Component\Panther\ExceptionThrower;
 
@@ -154,9 +155,15 @@ public function parents()
     /**
      * @see https://github.com/symfony/symfony/issues/26432
      */
-    public function children()
+    public function children(string $selector = null)
     {
-        return $this->createSubCrawlerFromXpath('child::*');
+        $xpath = 'child::*';
+        if (null !== $selector) {
+            $converter = $this->createCssSelectorConverter();
+            $xpath = $converter->toXPath($selector, 'child::');
+        }
+
+        return $this->createSubCrawlerFromXpath($xpath);
     }
 
     public function attr($attribute): string
@@ -174,16 +181,32 @@ public function nodeName(): string
         return $this->getElementOrThrow()->getTagName();
     }
 
-    public function text(): string
+    public function text($default = null): string
     {
-        return $this->getElementOrThrow()->getText();
+        try {
+            return $this->getElementOrThrow()->getText();
+        } catch (\InvalidArgumentException $e) {
+            if (null === $default) {
+                throw $e;
+            }
+
+            return (string) $default;
+        }
     }
 
-    public function html(): string
+    public function html($default = null): string
     {
-        $this->getElementOrThrow();
+        try {
+            $this->getElementOrThrow();
+
+            return $this->attr('outerHTML');
+        } catch (\InvalidArgumentException $e) {
+            if (null === $default) {
+                throw $e;
+            }
 
-        return $this->attr('outerHTML');
+            return (string) $default;
+        }
     }
 
     public function evaluate($xpath): self
@@ -453,4 +476,16 @@ public function findElements(WebDriverBy $locator)
     {
         return $this->getElementOrThrow()->findElements($locator);
     }
+
+    /**
+     * @throws \LogicException If the CssSelector Component is not available
+     */
+    private function createCssSelectorConverter(): CssSelectorConverter
+    {
+        if (!class_exists(CssSelectorConverter::class)) {
+            throw new \LogicException('To filter with a CSS selector, install the CssSelector component ("composer require symfony/css-selector"). Or use filterXpath instead.');
+        }
+
+        return new CssSelectorConverter();
+    }
 }

src/PantherTestCase.php

@@ -57,7 +57,13 @@ public static function assertPageTitleContains(string $expectedTitle, string $me
             {
                 $client = self::getClient();
                 if ($client instanceof PantherClient) {
-                    self::assertStringContainsString($expectedTitle, $client->getTitle());
+                    if (method_exists(self::class, 'assertStringContainsString')) {
+                        self::assertStringContainsString($expectedTitle, $client->getTitle());
+
+                        return;
+                    }
+
+                    self::assertContains($expectedTitle, $client->getTitle());
 
                     return;
                 }

tests/DomCrawler/CrawlerTest.php

@@ -197,6 +197,23 @@ public function testChildren(callable $clientFactory): void
         $this->assertSame(['h1', 'main', 'p', 'p', 'input'], $names);
     }
 
+    /**
+     * @dataProvider clientFactoryProvider
+     *
+     * @param mixed $clientFactory
+     */
+    public function testChildrenFilter($clientFactory): void
+    {
+        $crawler = $this->request($clientFactory, '/basic.html');
+
+        $names = [];
+        $crawler->filter('body')->children('p')->each(function (Crawler $c, int $i) use (&$names) {
+            $names[$i] = $c->nodeName();
+        });
+
+        $this->assertSame(['p', 'p'], $names);
+    }
+
     /**
      * @dataProvider clientFactoryProvider
      */
@@ -279,4 +296,22 @@ public function testImage(callable $clientFactory, string $type): void
         $this->assertSame('GET', $image->getMethod());
         $this->assertSame('https://api-platform.com/logo-250x250.png', $image->getUri());
     }
+
+    /**
+     * @dataProvider clientFactoryProvider
+     */
+    public function testTextDefault(callable $clientFactory): void
+    {
+        $crawler = $this->request($clientFactory, '/basic.html');
+        $this->assertSame('default', $crawler->filter('header')->text('default'));
+    }
+
+    /**
+     * @dataProvider clientFactoryProvider
+     */
+    public function testHtmlDefault(callable $clientFactory): void
+    {
+        $crawler = $this->request($clientFactory, '/basic.html');
+        $this->assertSame('default', $crawler->filter('header')->html('default'));
+    }
 }