From: Christoph M. Becker <cmb@php.net>
Date: Tue, 14 Jul 2015 08:02:25 +0000 (+0200)
Subject: Merge branch 'master' of http://git.php.net/repository/php-src
X-Git-Tag: php-7.1.1RC1~35^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f4135ad800a33ab3458ea2cb97abcd33cefe69e;p=php

Merge branch 'master' of http://git.php.net/repository/php-src

# By Bob Weinand (5) and others
# Via Bob Weinand
* 'master' of http://git.php.net/repository/php-src:
  We want to track phpdbg bugs in official bug tracker now; updated URL
  Show also runtime-bound functions/classes/methods with phpdbg -p
  One less comparison
  Fix potential segfault
  Closures only have {closure}() as method name Prefixing a class name does not make sense as they may be rebound to another scope, where this will be confusing
  Fix __METHOD__ in functions nested into methods
  Init variable to NULL before passing to zpp
  Format alignment
  PHP 7 OCI8: fix bug57702.phpt regression
---

9f4135ad800a33ab3458ea2cb97abcd33cefe69e