Merge pull request #93 from stof/towards_v2

Prepare the version 2 of the driver
minkphp · Dec 23, 2021 · 22eeffb · 22eeffb
2 parents 715f8f1 + 2605e73
commit 22eeffb
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 108 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0' ]
+        php: [ '7.2', '7.3', '7.4', '8.0' ]
         symfony_deprecations_helper: [ '' ]
         include:
           - php: 8.1
@@ -40,11 +40,6 @@ jobs:
           # PHP 7.1 development web server segfaults if timezone not set.
           ini-values: date.timezone=Europe/Paris, error_reporting=-1, display_errors=On
 
-      - name: Configure for PHP >= 7.1
-        if: "${{ matrix.php >= '7.1' && matrix.symfony_version == '' }}"
-        run: |
-          composer require --no-update --dev symfony/error-handler "^4.4 || ^5.0"
-
       - name: Install dependencies
         run: |
           composer update --no-interaction --prefer-dist

diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ require "vendor/autoload.php";
 use Behat\Mink\Mink,
     Behat\Mink\Session,
     Behat\Mink\Driver\GoutteDriver,
-    Behat\Mink\Driver\Goutte\Client as GoutteClient;
+    Goutte\Client as GoutteClient;
 
 $mink = new Mink(array(
     'goutte' => new Session(new GoutteDriver(new GoutteClient())),
@@ -39,8 +39,8 @@ Add a file composer.json with content:
 ``` json
 {
     "require": {
-        "behat/mink":               "~1.5",
-        "behat/mink-goutte-driver": "~1.0"
+        "behat/mink":               "^1.9",
+        "behat/mink-goutte-driver": "^2.0"
     }
 }
 ```

diff --git a/composer.json b/composer.json
@@ -15,13 +15,14 @@
     ],
 
     "require": {
-        "php":                           ">=5.4",
-        "behat/mink-browserkit-driver":  "~1.2@dev",
-        "fabpot/goutte":                 "~1.0.4|~2.0|~3.1"
+        "php":                           ">=7.2",
+        "behat/mink-browserkit-driver":  "^2.0@dev",
+        "fabpot/goutte":                 "^4.0"
     },
 
     "require-dev": {
-        "mink/driver-testsuite": "dev-master"
+        "mink/driver-testsuite": "dev-master",
+        "symfony/error-handler": "^4.4 || ^5.0"
     },
 
     "autoload": {
@@ -38,7 +39,7 @@
 
     "extra": {
         "branch-alias": {
-            "dev-master": "1.x-dev"
+            "dev-master": "2.x-dev"
         }
     }
 }
diff --git a/src/Goutte/Client.php b/src/Goutte/Client.php
@@ -11,33 +11,10 @@
 namespace Behat\Mink\Driver\Goutte;
 
 use Goutte\Client as BaseClient;
-use Symfony\Component\BrowserKit\Response;
 
 /**
  * Client overrides to support Mink functionality.
  */
 class Client extends BaseClient
 {
-    /**
-     * Reads response meta tags to guess content-type charset.
-     *
-     * @param Response $response
-     *
-     * @return Response
-     */
-    protected function filterResponse($response)
-    {
-        $contentType = $response->getHeader('Content-Type');
-
-        if (!$contentType || false === strpos($contentType, 'charset=')) {
-            if (preg_match('/\<meta[^\>]+charset *= *["\']?([a-zA-Z\-0-9]+)/i', $response->getContent(), $matches)) {
-                $headers = $response->getHeaders();
-                $headers['Content-Type'] = $contentType.';charset='.$matches[1];
-
-                $response = new Response($response->getContent(), $response->getStatus(), $headers);
-            }
-        }
-
-        return parent::filterResponse($response);
-    }
 }
diff --git a/src/GoutteDriver.php b/src/GoutteDriver.php
@@ -10,7 +10,6 @@
 
 namespace Behat\Mink\Driver;
 
-use Behat\Mink\Driver\Goutte\Client as ExtendedClient;
 use Goutte\Client;
 
 /**
@@ -27,56 +26,6 @@ class GoutteDriver extends BrowserKitDriver
      */
     public function __construct(Client $client = null)
     {
-        parent::__construct($client ?: new ExtendedClient());
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setBasicAuth($user, $password)
-    {
-        if (false === $user) {
-            $this->getClient()->resetAuth();
-
-            return;
-        }
-
-        $this->getClient()->setAuth($user, $password);
-    }
-
-    /**
-     * Gets the Goutte client.
-     *
-     * The method is overwritten only to provide the appropriate return type hint.
-     *
-     * @return Client
-     */
-    public function getClient()
-    {
-        return parent::getClient();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function reset()
-    {
-        parent::reset();
-        $this->getClient()->resetAuth();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function prepareUrl($url)
-    {
-        $parts = parse_url($url);
-        if (isset($parts['user']) || isset($parts['pass'])) {
-            $this->setBasicAuth(
-                isset($parts['user']) ? $parts['user'] : '',
-                isset($parts['pass']) ? $parts['pass'] : ''
-            );
-        }
-        return $url;
+        parent::__construct($client ?? new Client());
     }
 }
diff --git a/tests/Custom/InstantiationTest.php b/tests/Custom/InstantiationTest.php
@@ -3,6 +3,7 @@
 namespace Behat\Mink\Tests\Driver\Custom;
 
 use Behat\Mink\Driver\GoutteDriver;
+use Goutte\Client;
 use PHPUnit\Framework\TestCase;
 
 class InstantiationTest extends TestCase
@@ -23,6 +24,6 @@ public function testInstantiateWithoutClient()
     {
         $driver = new GoutteDriver();
 
-        $this->assertInstanceOf('Behat\Mink\Driver\Goutte\Client', $driver->getClient());
+        $this->assertInstanceOf(Client::class, $driver->getClient());
     }
 }
diff --git a/tests/GoutteConfig.php b/tests/GoutteConfig.php
@@ -23,22 +23,4 @@ protected function supportsJs()
     {
         return false;
     }
-
-    public function skipMessage($testCase, $test)
-    {
-        if (
-            'Behat\Mink\Tests\Driver\Form\Html5Test' === $testCase
-            && in_array($test, array(
-                'testHtml5FormAction',
-                'testHtml5FormMethod',
-            ))
-            && !method_exists('Symfony\Component\DomCrawler\Tests\FormTest', 'testGetMethodWithOverride')
-            // Symfony 4.4 removed tests from dist archives, making the previous detection return a false-positive
-            && !method_exists('Symfony\Component\DomCrawler\Form', 'getName')
-        ) {
-            return 'Mink Goutte doesn\'t support HTML5 form attributes before Symfony 3.3';
-        }
-
-        return parent::skipMessage($testCase, $test);
-    }
 }