]> granicus.if.org Git - php/log
php
6 years agoRemove mkdep.awk
Peter Kokot [Fri, 19 Oct 2018 08:00:16 +0000 (10:00 +0200)]
Remove mkdep.awk

The `mkdep.awk` file was part of the previous *nix build system and was
used to create a .deps file with a list of dependencies that could be
processed by Automake further on.

Newer build system was done via 9d9d39a0de3bec962c343051011f5a2ed7d7b242
and outdated files removed via 22815419f8c5da902971d3aa12f2cbfcc3b41aff
so the current file in the PHP source code is not used anymore.

Additionally, the *.slo files were processed by this file. The *.slo
files also used to be generated by older libtool so today, these don't
get generated anymore.

6 years agoMerge branch 'PHP-7.3'
Peter Kokot [Sat, 20 Oct 2018 07:55:33 +0000 (09:55 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  Fix #77041: buildconf should output error messages to stderr

6 years ago[ci skip] Update NEWS
Peter Kokot [Sat, 20 Oct 2018 07:55:07 +0000 (09:55 +0200)]
[ci skip] Update NEWS

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Peter Kokot [Sat, 20 Oct 2018 07:54:00 +0000 (09:54 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  Fix #77041: buildconf should output error messages to stderr

6 years ago[ci skip] Update NEWS
Peter Kokot [Sat, 20 Oct 2018 07:52:46 +0000 (09:52 +0200)]
[ci skip] Update NEWS

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Peter Kokot [Sat, 20 Oct 2018 07:51:22 +0000 (09:51 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  [ci skip] Update NEWS
  Fix #77041: buildconf should output error messages to stderr

6 years ago[ci skip] Update NEWS
Peter Kokot [Sat, 20 Oct 2018 07:48:50 +0000 (09:48 +0200)]
[ci skip] Update NEWS

6 years agoFix #77041: buildconf should output error messages to stderr
Mizunashi Mana [Sat, 20 Oct 2018 07:42:56 +0000 (09:42 +0200)]
Fix #77041: buildconf should output error messages to stderr

6 years agoMark "top-level" functions.
Dmitry Stogov [Fri, 19 Oct 2018 10:22:29 +0000 (13:22 +0300)]
Mark "top-level" functions.

6 years agoDon't initialize static_member_tables during start-up, when inherit internal classes.
Dmitry Stogov [Fri, 19 Oct 2018 10:21:31 +0000 (13:21 +0300)]
Don't initialize static_member_tables during start-up, when inherit internal classes.

6 years agoMerge branch 'PHP-7.3'
Peter Kokot [Thu, 18 Oct 2018 22:12:48 +0000 (00:12 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  Fix #77035: The phpize and ./configure create redundant .deps file

6 years ago[ci skip] Update NEWS
Peter Kokot [Thu, 18 Oct 2018 22:12:34 +0000 (00:12 +0200)]
[ci skip] Update NEWS

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Peter Kokot [Thu, 18 Oct 2018 22:10:22 +0000 (00:10 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  Fix #77035: The phpize and ./configure create redundant .deps file

6 years ago[ci skip] Update NEWS
Peter Kokot [Thu, 18 Oct 2018 22:08:57 +0000 (00:08 +0200)]
[ci skip] Update NEWS

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Peter Kokot [Thu, 18 Oct 2018 22:07:42 +0000 (00:07 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  [ci skip] Update NEWS
  Fix #77035: The phpize and ./configure create redundant .deps file

6 years ago[ci skip] Update NEWS
Peter Kokot [Thu, 18 Oct 2018 22:06:11 +0000 (00:06 +0200)]
[ci skip] Update NEWS

6 years agoFix #77035: The phpize and ./configure create redundant .deps file
Peter Kokot [Thu, 18 Oct 2018 22:02:09 +0000 (00:02 +0200)]
Fix #77035: The phpize and ./configure create redundant .deps file

The `.deps` file(s) was once used by Automake and created to write
dependencies to it. The file creation has been removed via the commit
779c11af21cf8a627b8f2f2edef9e9073c76ed94.

The phpize and ./configure script create a redundant .deps file in a
PECL extension directory which might cause confusions why is it used.
Today it is no longer relevant so this redundant artefact can be
removed in the phpize configure script.

6 years agoRemove outdated PEAR artefacts
Peter Kokot [Thu, 18 Oct 2018 11:43:34 +0000 (13:43 +0200)]
Remove outdated PEAR artefacts

The `pear/scripts`, `pear/php-config`, `pear/phpize`, and
`pear/run-tests` used to be part of the PEAR installation. Now, the
pear installation PHAR file is directly downloaded from pear.php.net
instead.

6 years agoMerge branch 'PHP-7.3'
Peter Kokot [Thu, 18 Oct 2018 21:40:00 +0000 (23:40 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fix tests/output/bug74815.phpt generating errors.log

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Peter Kokot [Thu, 18 Oct 2018 21:39:39 +0000 (23:39 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix tests/output/bug74815.phpt generating errors.log

6 years agoFix tests/output/bug74815.phpt generating errors.log
Peter Kokot [Thu, 18 Oct 2018 14:30:18 +0000 (16:30 +0200)]
Fix tests/output/bug74815.phpt generating errors.log

Test tests/output/bug74815.phpt was creating an errors.log file
in project root directory and didn't removed it after the test.

6 years agoRevert "Use C++ symbols, when C++11 or upper is compiled"
Anatol Belski [Thu, 18 Oct 2018 21:36:46 +0000 (23:36 +0200)]
Revert "Use C++ symbols, when C++11 or upper is compiled"

This reverts commit 322b97a19a3a06d7d66e6f74b4dc071384badf64.

GCC 5 vs. 8 seems to be a big deal in this regard. The approach needs
further consideration.

6 years agoUse C++ symbols, when C++11 or upper is compiled
Anatol Belski [Thu, 18 Oct 2018 21:16:43 +0000 (23:16 +0200)]
Use C++ symbols, when C++11 or upper is compiled

6 years agoAdded new line
Dmitry Stogov [Thu, 18 Oct 2018 13:40:24 +0000 (16:40 +0300)]
Added new line

6 years agoRemove stamp-h
Peter Kokot [Wed, 17 Oct 2018 04:06:50 +0000 (06:06 +0200)]
Remove stamp-h

The stamp-* files can be used as helpers for Makefiles to not redo
certain targets again. The stamp-h are mentioned in the Autoconf docs [1]
to help generate the config.h file.

Since the usage of stamp-h file was removed in 232afa4816c60a20d3db48c304ac59312d46ec46
this patch cleans few obsolete occurrences.

This patch also removes two occurrences of `main/stamp-h1` and
`main/streams/stamp-h1` rules in the .gitignore file since they are not
generated with the current build systems anymore. The `stamp-h$am_indx` files
were once generated using aclocal and automake.

[1] https://www.gnu.org/software/autoconf/manual/autoconf-2.69/autoconf.html

6 years agoMove all testing docs to qa.php.net
Peter Kokot [Sun, 7 Oct 2018 02:31:59 +0000 (04:31 +0200)]
Move all testing docs to qa.php.net

The qa.php.net currently includes nice collection of information about
tests and how to run them. Instead of maintaining two locations of this
information, this patch removes the README.TESTING from the php-src
repo. Patch for qa.php.net has been sent separately to that repo.

6 years agoFix a typo in UPGRADING.INTERNALS
Tyson Andre [Thu, 18 Oct 2018 01:14:46 +0000 (21:14 -0400)]
Fix a typo in UPGRADING.INTERNALS

6 years agoMerge branch 'PHP-7.3'
Anatol Belski [Wed, 17 Oct 2018 22:45:43 +0000 (00:45 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fix test when it's run on another drive

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Anatol Belski [Wed, 17 Oct 2018 22:45:17 +0000 (00:45 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix test when it's run on another drive

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Wed, 17 Oct 2018 22:44:43 +0000 (00:44 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix test when it's run on another drive

6 years agoFix test when it's run on another drive
Anatol Belski [Wed, 17 Oct 2018 22:43:24 +0000 (00:43 +0200)]
Fix test when it's run on another drive

6 years agoMerge branch 'PHP-7.3'
Christoph M. Becker [Wed, 17 Oct 2018 21:45:34 +0000 (23:45 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  [ci skip] Update UPGRADING wrt. tidyp support

6 years ago[ci skip] Update UPGRADING wrt. tidyp support
Christoph M. Becker [Wed, 17 Oct 2018 21:41:37 +0000 (23:41 +0200)]
[ci skip] Update UPGRADING wrt. tidyp support

This is especially noteworthy since `tidy_get_relase()` returns
'unknown' when built against libtidyp, which might break some code
which relies on `tidy_get_release()` to return a date formatted as
`yyyy/mm/dd`.

6 years agoFixed incorrect reallocation
Dmitry Stogov [Wed, 17 Oct 2018 14:44:03 +0000 (17:44 +0300)]
Fixed incorrect reallocation

6 years agoMerge branch 'PHP-7.3'
Christoph M. Becker [Wed, 17 Oct 2018 14:38:17 +0000 (16:38 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fix #77027: tidy::getOptDoc() not available on Windows

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Wed, 17 Oct 2018 14:36:25 +0000 (16:36 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #77027: tidy::getOptDoc() not available on Windows

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Wed, 17 Oct 2018 14:29:38 +0000 (16:29 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #77027: tidy::getOptDoc() not available on Windows

6 years agoFix #77027: tidy::getOptDoc() not available on Windows
Christoph M. Becker [Wed, 17 Oct 2018 14:27:07 +0000 (16:27 +0200)]
Fix #77027: tidy::getOptDoc() not available on Windows

We define the `HAVE_TIDYOPTGETDOC` macro unconditionally, since the
Windows PHP SDK ships libtidy 2009/04/06 or newer for a long time.

We do not add a regression test, since 021.phpt already tests
`tidy_get_opt_doc`, but has previously been skipped due to
unavailability of the function.

6 years agoRun CI tests under opcache.protect_memory=1
Nikita Popov [Wed, 17 Oct 2018 14:10:22 +0000 (16:10 +0200)]
Run CI tests under opcache.protect_memory=1

6 years agoFixed comment
Dmitry Stogov [Wed, 17 Oct 2018 13:56:32 +0000 (16:56 +0300)]
Fixed comment

6 years agoMicro optimizations
Dmitry Stogov [Wed, 17 Oct 2018 13:55:52 +0000 (16:55 +0300)]
Micro optimizations

6 years agoMark "top-level" classes
Dmitry Stogov [Wed, 17 Oct 2018 13:12:46 +0000 (16:12 +0300)]
Mark "top-level" classes

6 years agoImmutable clases and op_arrays.
Dmitry Stogov [Wed, 17 Oct 2018 12:52:50 +0000 (15:52 +0300)]
Immutable clases and op_arrays.

Squashed commit of the following:

commit cd0c36c3f943849e5b97a8dbe2dd029fbeab3df9
Merge: 4740dabb84 ad6738e886
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Oct 17 14:43:38 2018 +0300

    Merge branch 'master' into immutable

    * master:
      Remove the "auto" encoding
      Fixed bug #77025
      Add vtbls for EUC-TW encoding

commit 4740dabb843c6d4f7f866b4a2456073c9eaf4c77
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Oct 17 14:12:28 2018 +0300

    Reverted back ce->iterator_funcs_ptr. Initialize ce->iterator_funcs_ptr fields in immutable classes.

commit ad7a78b253be970db70c2251e66f9297d8e7f829
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Oct 17 11:46:30 2018 +0300

    Added comment

commit 0276ea51875bab37be01a4dc5e5a047c5698c571
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Oct 17 11:42:43 2018 +0300

    Added type cast

commit c63fc5d5f19c58498108d1698055b2b442227eb3
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Oct 17 11:36:51 2018 +0300

    Moved static class members initialization into the proper place.

commit b945548e9306b1826c881918858b5e5aa3eb3002
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Oct 17 11:21:03 2018 +0300

    Removed redundand assertion

commit d5a41088401814c829847db212488f8aae39bcd2
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Oct 17 11:19:13 2018 +0300

    Removed duplicate code

commit 8dadca8864e66de70a24bdf1181bcf7dd8fb27d7
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Oct 17 11:05:43 2018 +0300

    Hide offset encoding magic in ZEND_MAP_PTR_IS_OFFSET(), ZEND_MAP_PTR_OFFSET2PTR() and ZEND_MAP_PTR_PTR2OFFSET() macros.

commit 9ef07c88bd76801e2d4fbfeab3ebfd6e6a67ac5f
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Oct 17 10:48:29 2018 +0300

    typo

commit a06f0f3d3aba53e766046221ee44fb9720389ecc
Merge: 94099586ec 3412345ffe
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Oct 17 10:47:07 2018 +0300

    Merge branch 'master' into immutable

    * master:
      Remove unused variable makefile_am_files
      Classify object handlers are required/optional
      Add support for getting SKIP_TAGSTART and SKIP_WHITE options
      Remove some obsolete config_vars.mk occurrences
      Remove bsd_converted from .gitignore
      Remove configuration parser and scanners ignores
      Remove obsolete buildconf.stamp from .gitignore
      [ci skip] Add magicdata.patch exception to .gitignore
      Remove outdated ext/spl/examples items from .gitignore
      Remove unused test.inc in ext/iconv/tests

commit 94099586ec599117581ca01c15b1f6c5f749e23a
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Mon Oct 15 23:34:01 2018 +0300

    Immutable clases and op_arrays

6 years agoMerge branch 'PHP-7.3'
Nikita Popov [Wed, 17 Oct 2018 10:51:17 +0000 (12:51 +0200)]
Merge branch 'PHP-7.3'

6 years agoRemove the "auto" encoding
Nikita Popov [Wed, 17 Oct 2018 10:47:45 +0000 (12:47 +0200)]
Remove the "auto" encoding

"auto" is only meaningful in functions which accept an encoding
*list* and support encoding detection. These functions have
explicit checks for "auto". It cannot be used as a standalone
encoding in any meaningful capacity, so I'm dropping it entirely.

6 years agoMerge branch 'PHP-7.3'
Nikita Popov [Wed, 17 Oct 2018 10:40:39 +0000 (12:40 +0200)]
Merge branch 'PHP-7.3'

6 years agoFixed bug #77025
Nikita Popov [Wed, 17 Oct 2018 10:37:52 +0000 (12:37 +0200)]
Fixed bug #77025

Implements 8bit conversions equivalently to iso-8859-1 conversions.
This seems quite dubious to me, but seems to match the previous
behavior.

It might make more sense to map the characters into a private area
instead, so that the 8bit encoding is treated as binary data with
no case conversions (including no case conversions in the ascii
range).

6 years agoAdd vtbls for EUC-TW encoding
Nikita Popov [Wed, 17 Oct 2018 10:10:16 +0000 (12:10 +0200)]
Add vtbls for EUC-TW encoding

6 years agoRemove unused variable makefile_am_files
Peter Kokot [Tue, 16 Oct 2018 20:33:04 +0000 (22:33 +0200)]
Remove unused variable makefile_am_files

The `makefile_am_files` was part of the previous build system where
automake was used to build Makefiles. Since 9d9d39a0de3bec962c343051011f5a2ed7d7b242
this is not used anymore and can be removed.

6 years agoClassify object handlers are required/optional
Nikita Popov [Sat, 13 Oct 2018 13:30:27 +0000 (15:30 +0200)]
Classify object handlers are required/optional

6 years agoMerge branch 'PHP-7.3'
Christoph M. Becker [Tue, 16 Oct 2018 16:51:51 +0000 (18:51 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Add support for getting SKIP_TAGSTART and SKIP_WHITE options

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Tue, 16 Oct 2018 16:50:33 +0000 (18:50 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Add support for getting SKIP_TAGSTART and SKIP_WHITE options

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Tue, 16 Oct 2018 16:48:36 +0000 (18:48 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Add support for getting SKIP_TAGSTART and SKIP_WHITE options

6 years agoAdd support for getting SKIP_TAGSTART and SKIP_WHITE options
Christoph M. Becker [Tue, 16 Oct 2018 16:47:31 +0000 (18:47 +0200)]
Add support for getting SKIP_TAGSTART and SKIP_WHITE options

When `XML_OPTION_SKIP_TAGSTART` and `XML_OPTION_SKIP_WHITE` had been
introduced[1], it had been overlooked to also support them for
`xml_parser_get_option()`.  We catch up on that.

[1] <http://git.php.net/?p=php-src.git;a=commit;h=b57dc275950b228f2399990471c4f22b7d154c6c>

6 years agoRemove some obsolete config_vars.mk occurrences
Peter Kokot [Tue, 16 Oct 2018 16:05:06 +0000 (18:05 +0200)]
Remove some obsolete config_vars.mk occurrences

The `config_vars.mk` file was a part of previous *nix build system and
has been removed via 9d9d39a0de3bec962c343051011f5a2ed7d7b242.

6 years agoRemove bsd_converted from .gitignore
Peter Kokot [Tue, 16 Oct 2018 15:30:13 +0000 (17:30 +0200)]
Remove bsd_converted from .gitignore

The `bsd_converted` file was once used as a temporary locking mechanism
on BSD systems builds and has been made obsolete via commit
9d9d39a0de3bec962c343051011f5a2ed7d7b242
so it can be also removed from the main .gitignore file.

6 years agoRemove configuration parser and scanners ignores
Peter Kokot [Tue, 16 Oct 2018 15:20:18 +0000 (17:20 +0200)]
Remove configuration parser and scanners ignores

The configuration-parser.c, configuration-parser.h,
configuration-parser.output and configuration-scanner.c were refactored
via 78194a47b7ad76aaea3bb8e91fa0f5707ae88d00 and can be removed in the
.gitignore.

6 years agoRemove obsolete buildconf.stamp from .gitignore
Peter Kokot [Tue, 16 Oct 2018 11:33:07 +0000 (13:33 +0200)]
Remove obsolete buildconf.stamp from .gitignore

The buildconf.stamp file was used to store particular build time
information in the past and then got removed via the
6c6c0a630c48190df5fa47567699760054748f9a
and the migration usage of the build/build.mk file only.

6 years ago[ci skip] Add magicdata.patch exception to .gitignore
Peter Kokot [Tue, 16 Oct 2018 09:04:39 +0000 (11:04 +0200)]
[ci skip] Add magicdata.patch exception to .gitignore

6 years agoRemove outdated ext/spl/examples items from .gitignore
Peter Kokot [Tue, 16 Oct 2018 08:38:19 +0000 (10:38 +0200)]
Remove outdated ext/spl/examples items from .gitignore

6 years agoRemove unused test.inc in ext/iconv/tests
Peter Kokot [Mon, 15 Oct 2018 09:10:23 +0000 (11:10 +0200)]
Remove unused test.inc in ext/iconv/tests

6 years agoRemove value from --CGI-- section
Peter Kokot [Mon, 15 Oct 2018 05:13:53 +0000 (07:13 +0200)]
Remove value from --CGI-- section

The `--CGI--` section takes no value and is enabled as empty already.

6 years agoMerge branch 'PHP-7.3'
Peter Kokot [Mon, 15 Oct 2018 03:04:38 +0000 (05:04 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fix failing Zend/tests due to newlines

6 years agoFix failing Zend/tests due to newlines
Peter Kokot [Mon, 15 Oct 2018 03:04:29 +0000 (05:04 +0200)]
Fix failing Zend/tests due to newlines

6 years agoSync leading and final newlines in *.phpt sections
Peter Kokot [Mon, 15 Oct 2018 02:33:09 +0000 (04:33 +0200)]
Sync leading and final newlines in *.phpt sections

This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines in all
*.phpt sections.

According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.

C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."

Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.

[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2

6 years agoMerge branch 'PHP-7.3'
Peter Kokot [Mon, 15 Oct 2018 02:32:49 +0000 (04:32 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Sync leading and final newlines in *.phpt sections
  Sync leading and final newlines in *.phpt sections
  Sync leading and final newlines in *.phpt sections

6 years agoSync leading and final newlines in *.phpt sections
Peter Kokot [Mon, 15 Oct 2018 02:32:30 +0000 (04:32 +0200)]
Sync leading and final newlines in *.phpt sections

This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines in all
*.phpt sections.

According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.

C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."

Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.

[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Peter Kokot [Mon, 15 Oct 2018 02:31:53 +0000 (04:31 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Sync leading and final newlines in *.phpt sections
  Sync leading and final newlines in *.phpt sections

6 years agoSync leading and final newlines in *.phpt sections
Peter Kokot [Mon, 15 Oct 2018 02:31:31 +0000 (04:31 +0200)]
Sync leading and final newlines in *.phpt sections

This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines in all
*.phpt sections.

According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.

C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."

Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.

[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Peter Kokot [Mon, 15 Oct 2018 02:30:40 +0000 (04:30 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Sync leading and final newlines in *.phpt sections

6 years agoSync leading and final newlines in *.phpt sections
Peter Kokot [Mon, 15 Oct 2018 02:29:24 +0000 (04:29 +0200)]
Sync leading and final newlines in *.phpt sections

This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines in all
*.phpt sections.

According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.

C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."

Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.

[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2

6 years agoRemove assignment irrelevant for release build
Anatol Belski [Sun, 14 Oct 2018 19:32:35 +0000 (21:32 +0200)]
Remove assignment irrelevant for release build

6 years agoTrim trailing whitespace in *.phpt
Peter Kokot [Sun, 14 Oct 2018 16:03:31 +0000 (18:03 +0200)]
Trim trailing whitespace in *.phpt

6 years agoMerge branch 'PHP-7.3'
Peter Kokot [Sun, 14 Oct 2018 17:45:40 +0000 (19:45 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Trim trailing whitespace in *.phpt
  Trim trailing whitespace in *.phpt
  Trim trailing whitespace in *.phpt

6 years agoTrim trailing whitespace in *.phpt
Peter Kokot [Sun, 14 Oct 2018 15:45:48 +0000 (17:45 +0200)]
Trim trailing whitespace in *.phpt

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Peter Kokot [Sun, 14 Oct 2018 17:44:33 +0000 (19:44 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Trim trailing whitespace in *.phpt
  Trim trailing whitespace in *.phpt

6 years agoTrim trailing whitespace in *.phpt
Peter Kokot [Sun, 14 Oct 2018 15:23:43 +0000 (17:23 +0200)]
Trim trailing whitespace in *.phpt

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Peter Kokot [Sun, 14 Oct 2018 17:43:39 +0000 (19:43 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Trim trailing whitespace in *.phpt

6 years agoTrim trailing whitespace in *.phpt
Peter Kokot [Sun, 14 Oct 2018 13:37:22 +0000 (15:37 +0200)]
Trim trailing whitespace in *.phpt

6 years agoTrim trailing whitespace in tests
Gabriel Caruso [Sun, 16 Sep 2018 17:16:42 +0000 (14:16 -0300)]
Trim trailing whitespace in tests

6 years agoMerge branch 'PHP-7.3'
Peter Kokot [Sun, 14 Oct 2018 11:41:32 +0000 (13:41 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fix failing ext/session/tests due to final newlines

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Peter Kokot [Sun, 14 Oct 2018 11:41:21 +0000 (13:41 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix failing ext/session/tests due to final newlines

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Peter Kokot [Sun, 14 Oct 2018 11:41:09 +0000 (13:41 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix failing ext/session/tests due to final newlines

6 years agoFix failing ext/session/tests due to final newlines
Peter Kokot [Sun, 14 Oct 2018 11:38:28 +0000 (13:38 +0200)]
Fix failing ext/session/tests due to final newlines

6 years agoSync leading and final newlines in source code files
Peter Kokot [Sun, 14 Oct 2018 10:56:38 +0000 (12:56 +0200)]
Sync leading and final newlines in source code files

This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines.

According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.

C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."

Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.

[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2

6 years agoMerge branch 'PHP-7.3'
Peter Kokot [Sun, 14 Oct 2018 10:55:47 +0000 (12:55 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Sync leading and final newlines in source code files
  Sync leading and final newlines in source code files
  Sync leading and final newlines in source code files

6 years agoSync leading and final newlines in source code files
Peter Kokot [Sun, 14 Oct 2018 10:55:24 +0000 (12:55 +0200)]
Sync leading and final newlines in source code files

This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines.

According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.

C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."

Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.

[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Peter Kokot [Sun, 14 Oct 2018 10:54:39 +0000 (12:54 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Sync leading and final newlines in source code files
  Sync leading and final newlines in source code files

6 years agoSync leading and final newlines in source code files
Peter Kokot [Sun, 14 Oct 2018 10:54:08 +0000 (12:54 +0200)]
Sync leading and final newlines in source code files

This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines.

According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.

C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."

Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.

[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Peter Kokot [Sun, 14 Oct 2018 10:52:38 +0000 (12:52 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Sync leading and final newlines in source code files

6 years agoSync leading and final newlines in source code files
Peter Kokot [Sun, 14 Oct 2018 10:51:01 +0000 (12:51 +0200)]
Sync leading and final newlines in source code files

This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines.

According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.

C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."

Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.

[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2

6 years agoMerge branch 'PHP-7.3'
Frank Denis [Sun, 14 Oct 2018 09:03:09 +0000 (11:03 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  ext/sodium: sodium_pad(): do not copy any bytes if the string is empty
  ext/sodium: Fix sodium_pad() with blocksize >= 256
  ext/sodium: Use a correct max output size for base64 decoding
  ext/sodium: Avoid shifts wider than 32 bits on size_t values

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Frank Denis [Sun, 14 Oct 2018 09:01:53 +0000 (11:01 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  ext/sodium: sodium_pad(): do not copy any bytes if the string is empty
  ext/sodium: Fix sodium_pad() with blocksize >= 256
  ext/sodium: Use a correct max output size for base64 decoding
  ext/sodium: Avoid shifts wider than 32 bits on size_t values

6 years ago[ci skip] Update NEWS
Frank Denis [Sun, 14 Oct 2018 08:58:02 +0000 (10:58 +0200)]
[ci skip] Update NEWS

6 years agoext/sodium: sodium_pad(): do not copy any bytes if the string is empty
Frank Denis [Sun, 14 Oct 2018 08:43:21 +0000 (10:43 +0200)]
ext/sodium: sodium_pad(): do not copy any bytes if the string is empty

Spotted by San Zhang, thanks!

Backport from PECL libsodium-php 2.0.13

6 years agoext/sodium: Fix sodium_pad() with blocksize >= 256
Frank Denis [Sun, 14 Oct 2018 08:37:37 +0000 (10:37 +0200)]
ext/sodium: Fix sodium_pad() with blocksize >= 256

Backport from PECL libsodium-php 2.0.12

6 years agoext/sodium: Use a correct max output size for base64 decoding
Frank Denis [Sun, 14 Oct 2018 08:32:48 +0000 (10:32 +0200)]
ext/sodium: Use a correct max output size for base64 decoding

Also handle the case where the function is not available in test.

Backport from PECL libsodium-php 2.0.12

6 years agoext/sodium: Avoid shifts wider than 32 bits on size_t values
Frank Denis [Sun, 14 Oct 2018 08:21:29 +0000 (10:21 +0200)]
ext/sodium: Avoid shifts wider than 32 bits on size_t values

Backport from PECL libsodium-php 2.0.10

6 years agoMerge branch 'PHP-7.3'
Peter Kokot [Sat, 13 Oct 2018 13:23:56 +0000 (15:23 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fix failing tests/lang due to whitespace

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Peter Kokot [Sat, 13 Oct 2018 13:23:48 +0000 (15:23 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix failing tests/lang due to whitespace