8000 Merge pull request #150 from clue-labs/php8.1 · friends-of-reactphp/mysql@cde8b6f · GitHub
[go: up one dir, main page]
Skip to content

Commit cde8b6f

Browse files
WyriHaximusWyriHaximus
authored
Merge pull request #150 from clue-labs/php8.1
2 parents 01b4151 + d406c88 commit cde8b6f

File tree

6 files changed

+8
-20
lines changed

6 files changed

+8
-20
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
php:
14+
- 8.1
1415
- 8.0
1516
- 7.4
1617
- 7.3

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"react/event-loop": "^1.2",
1010
"react/promise": "^2.7",
1111
"react/promise-stream": "^1.1",
12-
"react/promise-timer": "^1.5",
12+
"react/promise-timer": "^1.8",
1313
"react/socket": "^1.9"
1414
},
1515
"require-dev": {

‎phpunit.xml.dist

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,11 @@
22

33
<!-- PHPUnit configuration file with new format for PHPUnit 9.3+ -->
44
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
backupGlobals="false"
6-
backupStaticAttributes="false"
5+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
76
bootstrap="vendor/autoload.php"
87
cacheResult="false"
9-
convertErrorsToExceptions="true"
10-
convertNoticesToExceptions="true"
11-
convertWarningsToExceptions="true"
128
colors="true"
13-
processIsolation="false"
14-
stopOnFailure="false"
15-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
9+
convertDeprecationsToExceptions="true">
1610
<testsuites>
1711
<testsuite name="React.MySQL Test Suite">
1812
<directory>./tests/</directory>

‎phpunit.xml.legacy

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,9 @@
22

33
<!-- PHPUnit configuration file with old format for PHPUnit 9.2 or older -->
44
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
backupGlobals="false"
6-
backupStaticAttributes="false"
5+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.8/phpunit.xsd"
76
bootstrap="vendor/autoload.php"
8-
colors="true"
9-
convertErrorsToExceptions="true"
10-
convertNoticesToExceptions="true"
11-
convertWarningsToExceptions="true"
12-
processIsolation="false"
13-
stopOnFailure="false"
14-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.8/phpunit.xsd">
7+
colors="true">
158
<testsuites>
169
<testsuite name="React.MySQL Test Suite">
1710
<directory>./tests/</directory>

‎src/Io/LazyConnection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class LazyConnection extends EventEmitter implements ConnectionInterface
3434
public function __construct(Factory $factory, $uri, LoopInterface $loop)
3535
{
3636
$args = [];
37-
\parse_str(\parse_url($uri, \PHP_URL_QUERY), $args);
37+
\parse_str((string) \parse_url($uri, \PHP_URL_QUERY), $args);
3838
if (isset($args['idle'])) {
3939
$this->idlePeriod = (float)$args['idle'];
4040
}

‎tests/ResultQueryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function testSelectStaticValueWillBeReturnedAsIs($value)
6868
*/
6969
public function testSelectStaticValueWillBeReturnedAsIsWithNoBackslashEscapesSqlMode($value)
7070
{
71-
if (strpos($value, '\\') !== false) {
71+
if ($value !== null && strpos($value, '\\') !== false) {
7272
// TODO: strings such as '%\\' work as-is when string contains percent?!
7373
$this->markTestIncomplete('Escaping backslash not supported when using NO_BACKSLASH_ESCAPES SQL mode');
7474
}

0 commit comments

Comments
 (0)
0