From: Stanislav Malyshev <stas@php.net>
Date: Mon, 5 Sep 2016 07:19:26 +0000 (-0700)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0RC2~56^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54f6c8d6dfae3fa8e8353e7b9dc08dd5d7ee2c88;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Use integer placeholders, since values can vary with the TDS version
---

54f6c8d6dfae3fa8e8353e7b9dc08dd5d7ee2c88
diff --cc ext/pdo_dblib/tests/bug_45876.phpt
index 5f1026e623,dd029f87e3..9de13ff3fb
--- a/ext/pdo_dblib/tests/bug_45876.phpt
+++ b/ext/pdo_dblib/tests/bug_45876.phpt
@@@ -15,9 -15,9 +15,9 @@@ var_dump($stmt->getColumnMeta(0))
  $stmt = null;
  ?>
  --EXPECTF--
 -array(8) {
 +array(10) {
    ["max_length"]=>
-   int(255)
+   int(%d)
    ["precision"]=>
    int(0)
    ["scale"]=>
@@@ -35,5 -29,7 +35,5 @@@
    ["name"]=>
    string(13) "TABLE_CATALOG"
    ["len"]=>
-   int(255)
+   int(%d)
 -  ["pdo_type"]=>
 -  int(2)
  }