Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4: Fixed test sapi/cli/tests/006.phpt
14 years ago · 01f1894194
1 changed files with 1 additions and 1 deletions
--- a/sapi/cli/tests/006.phpt
+++ b/sapi/cli/tests/006.phpt
@ -69,7 +69,7 @@ string(%d) "Extension [ <persistent> extension #%d pcre version <no_version> ] {
      - Parameters [5] {
        Parameter #0 [ <required> $pattern ]
        Parameter #1 [ <required> $subject ]
        Parameter #2 [ <required> &$subpatterns ]
        Parameter #2 [ <optional> &$subpatterns ]
        Parameter #3 [ <optional> $flags ]
        Parameter #4 [ <optional> $offset ]
      }