From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 9 Mar 2020 21:51:11 +0000 (+0100)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.7RC1~147
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fea2994ff83ac75dcb5b186964f20a21b1df3ec0;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Enclose INI values containing {TMP} in quotes
---

fea2994ff83ac75dcb5b186964f20a21b1df3ec0
diff --cc ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt
index 27ad4fa4ec,feebc0d724..ab5d3fc99a
--- 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