Merge branch 'master' of https://git.php.net/push/php-src

* 'master' of https://git.php.net/push/php-src: (6215 commits)
  Extra comma
  Moved proxy object support in ASSIGN_ADD (and family) from VM to slow paths of corresponding operators
  Simplification
  zend_get_property_info_quick() cleanup and optimization
  initialize lineno before calling compile file file in phar
  Use ADDREF instead of DUP, it must be enough.
  Removed old irrelevant comment
  fixed compilation error
  Fix bug #68262: Broken reference across cloned objects
  export functions needed for phpdbg
  Fixed compilation
  Optimized property access handlers. Removed EG(std_property_info).
  Fixed bug #68199 (PDO::pgsqlGetNotify doesn't support NOTIFY payloads)
  Don't make difference between undefined and unaccessible properies when call __get() and family
  Don't make useless CSE
  array_pop/array_shift optimization
  check for zlib headers as well as lib for mysqlnd
  a realpath cache key can be int or float, catching this
  News entry for new curl constants
  News entry for new curl constants
  ...

6 files changed, 20 insertions, 20 deletions

diff --git a/scripts/dev/check_parameters.php b/scripts/dev/check_parameters.php
index c9f5169eec..658471ef2a 100644
--- a/scripts/dev/check_parameters.php
+++ b/scripts/dev/check_parameters.php
@@ -1,7 +1,7 @@
 <?php
 /*
   +----------------------------------------------------------------------+
-  | PHP Version 5                                                        |
+  | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
   | Copyright (c) 1997-2007 The PHP Group                                |
   +----------------------------------------------------------------------+
diff --git a/scripts/dev/credits b/scripts/dev/credits
index 801637cd19..5be84fda07 100755
--- a/scripts/dev/credits
+++ b/scripts/dev/credits
@@ -10,9 +10,9 @@ do
 /* 
                       DO NOT EDIT THIS FILE!
 
- it has been automaticaly created by php5/scripts/credits from  
- the information found in the various php5/ext/.../CREDITS and
- php5/sapi/.../CREDITS files 
+ it has been automaticaly created by php7/scripts/credits from  
+ the information found in the various php7/ext/.../CREDITS and
+ php7/sapi/.../CREDITS files 
  
  if you want to change an entry you have to edit the appropriate 
  CREDITS file instead
diff --git a/scripts/dev/find_tested.php b/scripts/dev/find_tested.php
index f95c46251c..e841e2e959 100644
--- a/scripts/dev/find_tested.php
+++ b/scripts/dev/find_tested.php
@@ -88,7 +88,7 @@ function mark_methods_as_tested($method_info, $phpt_files) {
 
         foreach($tested_functions as $tested_function) {
 
-            // go through method info array marking this funtion as tested
+            // go through method info array marking this function as tested
             foreach($method_info as &$current_method_record) {
                 if (strcasecmp($tested_function, $current_method_record[METHOD_NAME]) == 0) {
                     // matched the method name
diff --git a/scripts/dev/search_underscores.php b/scripts/dev/search_underscores.php
index 445228b8c5..67ed02f160 100755
--- a/scripts/dev/search_underscores.php
+++ b/scripts/dev/search_underscores.php
@@ -3,7 +3,7 @@
 
 /*
    +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
+   | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
    | Copyright (c) 1997-2006 The PHP Group                                |
    +----------------------------------------------------------------------+
diff --git a/scripts/man1/php-config.1.in b/scripts/man1/php-config.1.in
index 5c60408f42..ae2ee56bbc 100644
--- a/scripts/man1/php-config.1.in
+++ b/scripts/man1/php-config.1.in
@@ -1,12 +1,12 @@
-.TH php\-config 1 "2010" "The PHP Group" "Scripting Language"
+.TH @program_prefix@php\-config 1 "2014" "The PHP Group" "Scripting Language"
 .SH NAME
-php\-config \- get information about PHP configuration and compile options
+@program_prefix@php\-config \- get information about PHP configuration and compile options
 .SH SYNOPSIS
-.B php\-config
+.B @program_prefix@php\-config
 [options]
 .LP
 .SH DESCRIPTION
-.B php\-config
+.B @program_prefix@php\-config
 is a simple shell script for obtaining information about installed PHP configuration.
 .SH OPTIONS
 .TP 15
@@ -57,15 +57,15 @@ PHP version
 .PD 0
 .B \-\-vernum
 PHP version as integer
-.TP
+.RS
 .PD 1
 .P
 .SH SEE ALSO
-.BR php (1)
+.BR @program_prefix@php (1)
 .SH VERSION INFORMATION
 This manpage describes \fBphp\fP, version @PHP_VERSION@.
 .SH COPYRIGHT
-Copyright \(co 1997\-2010 The PHP Group
+Copyright \(co 1997\-2014 The PHP Group
 .LP
 This source file is subject to version 3.01 of the PHP license,
 that is bundled with this package in the file LICENSE, and is
diff --git a/scripts/man1/phpize.1.in b/scripts/man1/phpize.1.in
index 8f62f867b7..e49adb1b79 100644
--- a/scripts/man1/phpize.1.in
+++ b/scripts/man1/phpize.1.in
@@ -1,12 +1,12 @@
-.TH phpize 1 "2010" "The PHP Group" "Scripting Language"
+.TH @program_prefix@phpize 1 "2014" "The PHP Group" "Scripting Language"
 .SH NAME
-phpize \- prepare a PHP extension for compiling
+@program_prefix@phpize \- prepare a PHP extension for compiling
 .SH SYNOPSIS
-.B phpize
+.B @program_prefix@phpize
 [options]
 .LP
 .SH DESCRIPTION
-.B phpize
+.B @program_prefix@phpize
 is a shell script to prepare PHP extension for compiling.
 .SH OPTIONS
 .TP 15
@@ -24,15 +24,15 @@ Prints usage information
 .PD 1
 .B \-v
 Prints API version information
-.TP
+.RS
 .PD 1
 .P
 .SH SEE ALSO
-.BR php (1)
+.BR @program_prefix@php (1)
 .SH VERSION INFORMATION
 This manpage describes \fBphp\fP, version @PHP_VERSION@.
 .SH COPYRIGHT
-Copyright \(co 1997\-2010 The PHP Group
+Copyright \(co 1997\-2014 The PHP Group
 .LP
 This source file is subject to version 3.01 of the PHP license,
 that is bundled with this package in the file LICENSE, and is