com php-src: Merge branch 'PHP-7.3' into PHP-7.4: ext/sqlite3 /tests/sqlite3_33_load_extension_param.phpt
| From: | Christoph Michael Becker | Date: | Tue, 21 May 2019 07:03:20 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.3' into PHP-7.4: ext/sqlite3 /tests/sqlite3_33_load_extension_param.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-106255@lists.php.net to get a copy of this message | ||
Commit: c982a4c3f9b78985ee6135bfae68227d60373d6c
Author: Christoph M. Becker <cmbecker69@gmx.de> Tue, 21 May 2019 09:03:20 +0200
Parents: e2f8d906cfd13a9e63efc6fac119f70a813b1ce4 11740abd6ba1ee47e7a2a149c0ddfe6b7c8145cc
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c982a4c3f9b78985ee6135bfae68227d60373d6c
Log:
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
use {TMP} placeholder in phpt tests
Changed paths:
MM ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt
Diff:
diff --cc ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt
index a5abb72,1a9b785..27ad4fa
--- a/ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt
+++ b/ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt
@@@ -4,15 -4,9 +4,15 @@@ SQLite3::loadExtension with empty exten
Jelle Lampaert
#Belgian Testfest 2009
--INI--
- sqlite3.extension_dir=/tmp
+ sqlite3.extension_dir={TMP}
--SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+<?php
+require_once(__DIR__ . '/skipif.inc');
+
+if (!method_exists('SQLite3', 'loadExtension')) {
+ die("skip if SQLITE_OMIT_LOAD_EXTENSION defined");
+}
+?>
--FILE--
<?php