Skip to content

Commit 8b8e016

Browse files
bug #442 Fix the ini_parse_quantity() polyfill (TimWolla)
This PR was merged into the 1.x branch. Discussion ---------- Fix the `ini_parse_quantity()` polyfill It previously was only defined (and tested) of the odbc extension is available. Commits ------- 2183daf Fix the `ini_parse_quantity()` polyfill
2 parents 5e9d505 + 2183daf commit 8b8e016

File tree

2 files changed

+15
-17
lines changed

2 files changed

+15
-17
lines changed

src/Php82/bootstrap.php

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,18 @@
1515
return;
1616
}
1717

18-
if (!extension_loaded('odbc')) {
19-
return;
20-
}
21-
22-
if (!function_exists('odbc_connection_string_is_quoted')) {
23-
function odbc_connection_string_is_quoted(string $str): bool { return p\Php82::odbc_connection_string_is_quoted($str); }
24-
}
25-
26-
if (!function_exists('odbc_connection_string_should_quote')) {
27-
function odbc_connection_string_should_quote(string $str): bool { return p\Php82::odbc_connection_string_should_quote($str); }
28-
}
29-
30-
if (!function_exists('odbc_connection_string_quote')) {
31-
function odbc_connection_string_quote(string $str): string { return p\Php82::odbc_connection_string_quote($str); }
18+
if (extension_loaded('odbc')) {
19+
if (!function_exists('odbc_connection_string_is_quoted')) {
20+
function odbc_connection_string_is_quoted(string $str): bool { return p\Php82::odbc_connection_string_is_quoted($str); }
21+
}
22+
23+
if (!function_exists('odbc_connection_string_should_quote')) {
24+
function odbc_connection_string_should_quote(string $str): bool { return p\Php82::odbc_connection_string_should_quote($str); }
25+
}
26+
27+
if (!function_exists('odbc_connection_string_quote')) {
28+
function odbc_connection_string_quote(string $str): string { return p\Php82::odbc_connection_string_quote($str); }
29+
}
3230
}
3331

3432
if (!function_exists('ini_parse_quantity')) {

tests/Php82/Php82Test.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@
1313

1414
use PHPUnit\Framework\TestCase;
1515

16-
/**
17-
* @requires extension odbc
18-
*/
1916
class Php82Test extends TestCase
2017
{
2118
/**
2219
* @dataProvider provideConnectionStringValuesFromUpstream
2320
* @dataProvider provideMoreConnectionStringValues
21+
* @requires extension odbc
2422
*/
2523
public function testConnectionStringIsQuoted(string $value, bool $isQuoted)
2624
{
@@ -30,6 +28,7 @@ public function testConnectionStringIsQuoted(string $value, bool $isQuoted)
3028
/**
3129
* @dataProvider provideConnectionStringValuesFromUpstream
3230
* @dataProvider provideMoreConnectionStringValues
31+
* @requires extension odbc
3332
*/
3433
public function testConnectionStringShouldQuote(string $value, bool $isQuoted, bool $shouldQuote)
3534
{
@@ -39,6 +38,7 @@ public function testConnectionStringShouldQuote(string $value, bool $isQuoted, b
3938
/**
4039
* @dataProvider provideConnectionStringValuesFromUpstream
4140
* @dataProvider provideMoreConnectionStringValues
41+
* @requires extension odbc
4242
*/
4343
public function testConnectionStringQuote(string $value, bool $isQuoted, bool $shouldQuote, string $quoted)
4444
{

0 commit comments

Comments
 (0)