Skip to content

Commit 63d09a1

Browse files
authored
Merge pull request #19 from Tenzian/ntlm_update
Add support for guzzle 7 client in amNTLMAuthenticated()
2 parents 114d640 + 5d3a437 commit 63d09a1

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

src/Codeception/Module/REST.php

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
* * shortDebugResponse *optional* - amount of chars to limit the api response length
3636
*
3737
* This module requires PHPBrowser or any of Framework modules enabled.
38-
*
38+
*
3939
* In case you need to configure low-level HTTP fields, that's done on the PHPBrowser level.
4040
* Check the example below for details.
4141
*
@@ -358,12 +358,9 @@ public function amNTLMAuthenticated($username, $password)
358358
if ($this->isFunctional) {
359359
throw new ModuleException(__METHOD__, 'Not supported by functional modules');
360360
}
361-
if (!defined('\GuzzleHttp\Client::VERSION')) {
361+
if (!defined('\GuzzleHttp\Client::MAJOR_VERSION') && !defined('\GuzzleHttp\Client::VERSION')) {
362362
throw new ModuleException(__METHOD__, 'Not supported if not using a Guzzle client');
363363
}
364-
if (version_compare(\GuzzleHttp\Client::VERSION, '6.2.1', 'lt')) {
365-
throw new ModuleException(__METHOD__, 'Guzzle ' . \GuzzleHttp\Client::VERSION . ' found. Requires Guzzle >=6.3.0 for NTLM auth option');
366-
}
367364
$this->client->setAuth($username, $password, 'ntlm');
368365
}
369366

@@ -1602,11 +1599,11 @@ public function startFollowingRedirects()
16021599
{
16031600
$this->client->followRedirects(true);
16041601
}
1605-
1602+
16061603
/**
16071604
* Sets SERVER parameters valid for all next requests.
16081605
* this will remove old ones.
1609-
*
1606+
*
16101607
* ```php
16111608
* $I->setServerParameters([]);
16121609
* ```
@@ -1615,10 +1612,10 @@ public function setServerParameters(array $params)
16151612
{
16161613
$this->client->setServerParameters($params);
16171614
}
1618-
1615+
16191616
/**
16201617
* Sets SERVER parameter valid for all next requests.
1621-
*
1618+
*
16221619
* ```php
16231620
* $I->haveServerParameter('name', 'value');
16241621
* ```

0 commit comments

Comments
 (0)