Merge branch 'PHP-7.4'

cmb69 · cmb69 · commit 8b5b4d886080 · 2019-08-07T13:04:42.000+02:00
* PHP-7.4:
  Skip test if ext/json is not available
diff --git a/ext/pdo_pgsql/tests/bug71885_2.phpt b/ext/pdo_pgsql/tests/bug71885_2.phpt
@@ -3,6 +3,7 @@ Request #71855 (PDO placeholder escaping, part 2)
 --SKIPIF--
 <?php
 if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
+if (!extension_loaded('json')) die('skip json extension not available');
 require_once dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
 require_once dirname(__FILE__) . '/config.inc';
 PDOTest::skip();
