]> granicus.if.org Git - php/log
php
6 years agoMerge branch 'PHP-7.4'
Anatol Belski [Sun, 31 Mar 2019 12:32:54 +0000 (14:32 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix return

6 years agoFix return
Anatol Belski [Sun, 31 Mar 2019 12:31:57 +0000 (14:31 +0200)]
Fix return

6 years agoMerge branch 'PHP-7.4'
Anatol Belski [Sun, 31 Mar 2019 12:27:02 +0000 (14:27 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Rework the VS version evaluation
  Implement stricter extension compatibility check

6 years agoRework the VS version evaluation
Anatol Belski [Sun, 31 Mar 2019 12:18:12 +0000 (14:18 +0200)]
Rework the VS version evaluation

For the latest versions, refer also to the Visual Studio version, not to
the exact toolset version. The latest Visual Studio versions are moving
fast and the method existed previously is not sutable to keep up
anymore. Instead of refering to the exact toolset, it refers to the
Visual Studio version and implies the latest toolset available there.
That is still not ideal, another situation can arise where VS version is
not changed, but the toolset version is. It might be better to refer to
it a generic way in the future or even omit at all, and improve the
internal compatibility checks instead.

6 years agoImplement stricter extension compatibility check
Anatol Belski [Sun, 31 Mar 2019 12:01:36 +0000 (14:01 +0200)]
Implement stricter extension compatibility check

This hardens the dynamic module loading by checking the linker compatibility
between the core and the dynamic module. This likely should be extended
for the CRT as well, as 2015, 2017 and 2019 versions of Visual Studio
all have same DLL name for the CRT.

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Sun, 31 Mar 2019 11:36:59 +0000 (13:36 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #77827: preg_match does not ignore \r in regex flags

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Sun, 31 Mar 2019 11:35:50 +0000 (13:35 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #77827: preg_match does not ignore \r in regex flags

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Sun, 31 Mar 2019 11:32:31 +0000 (13:32 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #77827: preg_match does not ignore \r in regex flags

6 years agoFix #77827: preg_match does not ignore \r in regex flags
Christoph M. Becker [Sun, 31 Mar 2019 11:31:54 +0000 (13:31 +0200)]
Fix #77827: preg_match does not ignore \r in regex flags

6 years agoMerge branch 'PHP-7.4'
Joe Watkins [Sun, 31 Mar 2019 07:47:04 +0000 (09:47 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  typo [ci skip]

6 years agotypo [ci skip]
Joe Watkins [Sun, 31 Mar 2019 07:46:36 +0000 (09:46 +0200)]
typo [ci skip]

6 years agoMerge branch 'PHP-7.4'
Joe Watkins [Sun, 31 Mar 2019 07:44:19 +0000 (09:44 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  correct readme [ci skip]

6 years agocorrect readme [ci skip]
Joe Watkins [Sun, 31 Mar 2019 07:43:53 +0000 (09:43 +0200)]
correct readme [ci skip]

6 years agoMerge branch 'PHP-7.4'
Anatol Belski [Sat, 30 Mar 2019 22:08:05 +0000 (23:08 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix memory leak

6 years agoFix memory leak
Anatol Belski [Sat, 30 Mar 2019 22:04:52 +0000 (23:04 +0100)]
Fix memory leak

6 years agoMerge branch 'PHP-7.4'
Anatol Belski [Sat, 30 Mar 2019 20:31:54 +0000 (21:31 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix memory leak

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Anatol Belski [Sat, 30 Mar 2019 20:30:48 +0000 (21:30 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix memory leak

6 years agoFix memory leak
Anatol Belski [Sat, 30 Mar 2019 20:27:37 +0000 (21:27 +0100)]
Fix memory leak

6 years agoMerge branch 'PHP-7.4'
Anatol Belski [Sat, 30 Mar 2019 20:09:33 +0000 (21:09 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Use wchar_t as native type in C

6 years agoUse wchar_t as native type in C
Anatol Belski [Sat, 30 Mar 2019 20:07:17 +0000 (21:07 +0100)]
Use wchar_t as native type in C

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sat, 30 Mar 2019 18:39:32 +0000 (19:39 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Move README files to a dedicated docs directory

6 years agoMove README files to a dedicated docs directory
Peter Kokot [Wed, 27 Mar 2019 19:51:45 +0000 (20:51 +0100)]
Move README files to a dedicated docs directory

The new dedicated docs directory has been introduced after a discussion
on GitHub[1].

Main issue it is addressing is the reduction of too many README files in
the project root directory. The new directory is dedicated for notes and
quick documentation files that either can't be put in the manual or wiki
pages or that relate to the php-src repository specifically and need to
live together with the source code.

Also the `docs` directory is by GitHub used for some repository
configuration files such as pull request templates, and contributing
documentation helper files that are integrated in the interface.

[1]: https://github.com/php/php-src/pull/3988

6 years agoMerge branch 'PHP-7.4'
Matteo Beccati [Sat, 30 Mar 2019 17:30:42 +0000 (18:30 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed SKIPIF when --disable-mbregex is used

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Matteo Beccati [Sat, 30 Mar 2019 17:30:20 +0000 (18:30 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fixed SKIPIF when --disable-mbregex is used

6 years agoFixed SKIPIF when --disable-mbregex is used
Matteo Beccati [Fri, 29 Mar 2019 13:09:39 +0000 (14:09 +0100)]
Fixed SKIPIF when --disable-mbregex is used

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Matteo Beccati [Sat, 30 Mar 2019 17:29:44 +0000 (18:29 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed SKIPIF when --disable-mbregex is used

6 years agoFixed SKIPIF when --disable-mbregex is used
Matteo Beccati [Fri, 29 Mar 2019 13:09:39 +0000 (14:09 +0100)]
Fixed SKIPIF when --disable-mbregex is used

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sat, 30 Mar 2019 15:09:28 +0000 (16:09 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  [ci skip] Add ffi_parser.c info

6 years ago[ci skip] Add ffi_parser.c info
Peter Kokot [Sat, 30 Mar 2019 15:09:23 +0000 (16:09 +0100)]
[ci skip] Add ffi_parser.c info

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sat, 30 Mar 2019 15:01:53 +0000 (16:01 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Join README.GIT-RULES and CONTRIBUTING.md

6 years agoJoin README.GIT-RULES and CONTRIBUTING.md
Peter Kokot [Mon, 25 Mar 2019 23:00:36 +0000 (00:00 +0100)]
Join README.GIT-RULES and CONTRIBUTING.md

This patch joins two very much related pieces of docs together in a
single file dedicated to all sorts of contributing info.

Some more changes:
- Branches info copied from the current master branch
- LXR and bonsai info removed
- Duplicated info reduced a bit
- Security branch updated to 7.1
- Refactor intro for Git commit rules
- Updated README.GIT-RULES file usage in win32/build/confutils.js
- Refactored configure.ac

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sat, 30 Mar 2019 12:59:22 +0000 (13:59 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  [ci skip] Mention PHP_PROG_BISON and PHP_PROG_RE2C

6 years ago[ci skip] Mention PHP_PROG_BISON and PHP_PROG_RE2C
Peter Kokot [Sat, 30 Mar 2019 12:59:14 +0000 (13:59 +0100)]
[ci skip] Mention PHP_PROG_BISON and PHP_PROG_RE2C

6 years agoMerge branch 'PHP-7.4'
Anatol Belski [Sat, 30 Mar 2019 11:54:05 +0000 (12:54 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix handling and extend ext/ffi/tests/044.phpt

6 years agoFix handling and extend ext/ffi/tests/044.phpt
Anatol Belski [Sat, 30 Mar 2019 11:53:32 +0000 (12:53 +0100)]
Fix handling and extend ext/ffi/tests/044.phpt

6 years agoNo need for scoping anymore
Anatol Belski [Sat, 30 Mar 2019 10:06:40 +0000 (11:06 +0100)]
No need for scoping anymore

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sat, 30 Mar 2019 01:02:14 +0000 (02:02 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Refactor PHP_PROG_BISON and PHP_PROG_RE2C

6 years agoRefactor PHP_PROG_BISON and PHP_PROG_RE2C
Peter Kokot [Sun, 17 Mar 2019 15:22:02 +0000 (16:22 +0100)]
Refactor PHP_PROG_BISON and PHP_PROG_RE2C

This patch refactors these macros to also checks for the required given
versions of bison and re2c.

- PHP_PROG_RE2C and PHP_PROG_BISON take optional args - minmimum version
  required, and bison also excluded versions.
- Instead of caching values this uses manual checking and messaging
  outputs.
- It looks like the minimum version of RE2C 0.13.4 is working ok so far.

The genfiles script improvements:
- Add make override in genfiles
- Move checkings from makedist to genfiles
- Refactored output messages
- Various minor enhancements

6 years agoMerge branch 'PHP-7.4'
Joe Watkins [Fri, 29 Mar 2019 18:06:59 +0000 (19:06 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  tsrm environment lock

6 years agotsrm environment lock
Joe Watkins [Fri, 29 Mar 2019 07:01:31 +0000 (08:01 +0100)]
tsrm environment lock

6 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Fri, 29 Mar 2019 14:29:32 +0000 (17:29 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Partial support for GCC mode attribute.

6 years agoPartial support for GCC mode attribute.
Dmitry Stogov [Fri, 29 Mar 2019 14:28:57 +0000 (17:28 +0300)]
Partial support for GCC mode attribute.

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Fri, 29 Mar 2019 13:35:51 +0000 (14:35 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix test expectations

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Fri, 29 Mar 2019 13:35:31 +0000 (14:35 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix test expectations

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Fri, 29 Mar 2019 13:34:07 +0000 (14:34 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix test expectations

6 years agoFix test expectations
Christoph M. Becker [Fri, 29 Mar 2019 12:57:39 +0000 (13:57 +0100)]
Fix test expectations

While bug77020.phpt already succeeds on Linux, it fails on Windows;
imap_fetchbody_variation3.phpt fails on both systems.  We therefore
make these tests more resilient.

6 years agoMerge branch 'PHP-7.4'
Matteo Beccati [Fri, 29 Mar 2019 13:24:40 +0000 (14:24 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Removed declaration inside for loops

6 years agoRemoved declaration inside for loops
Matteo Beccati [Fri, 29 Mar 2019 13:24:09 +0000 (14:24 +0100)]
Removed declaration inside for loops

6 years agoMerge branch 'PHP-7.4'
Matteo Beccati [Fri, 29 Mar 2019 13:11:46 +0000 (14:11 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed SKIPIF when --disable-mbregex is used

6 years agoFixed SKIPIF when --disable-mbregex is used
Matteo Beccati [Fri, 29 Mar 2019 13:09:39 +0000 (14:09 +0100)]
Fixed SKIPIF when --disable-mbregex is used

6 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Fri, 29 Mar 2019 11:34:07 +0000 (14:34 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed memory leaks

6 years agoFixed memory leaks
Dmitry Stogov [Fri, 29 Mar 2019 11:33:49 +0000 (14:33 +0300)]
Fixed memory leaks

6 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Fri, 29 Mar 2019 11:16:18 +0000 (14:16 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Allow usage of incomplete types for external variables, function parameters and return values

6 years agoAllow usage of incomplete types for external variables, function parameters and retur...
Dmitry Stogov [Fri, 29 Mar 2019 11:14:56 +0000 (14:14 +0300)]
Allow usage of incomplete types for external variables, function parameters and return values

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Fri, 29 Mar 2019 08:59:24 +0000 (09:59 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix test expectation

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Fri, 29 Mar 2019 08:58:37 +0000 (09:58 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix test expectation

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Fri, 29 Mar 2019 08:56:58 +0000 (09:56 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix test expectation

6 years agoFix test expectation
Christoph M. Becker [Fri, 29 Mar 2019 08:45:38 +0000 (09:45 +0100)]
Fix test expectation

The `W32_SM_SENDMAIL_FROM_MALFORMED` error message will only be shown
if the `$additional_headers` parameter is passed to `mail`, which is
not the case for this test.  Instead we have to expect `BAD_MSG_RPATH`.

6 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Thu, 28 Mar 2019 23:38:12 +0000 (02:38 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Added support for more GCC extensions: attributes, __extension__, __asm__ (ignored)

6 years agoAdded support for more GCC extensions: attributes, __extension__, __asm__ (ignored)
Dmitry Stogov [Thu, 28 Mar 2019 23:36:55 +0000 (02:36 +0300)]
Added support for more GCC extensions: attributes, __extension__, __asm__ (ignored)

6 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Thu, 28 Mar 2019 21:53:06 +0000 (00:53 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Ignore "__format__" attribute

6 years agoIgnore "__format__" attribute
Dmitry Stogov [Thu, 28 Mar 2019 21:52:39 +0000 (00:52 +0300)]
Ignore "__format__" attribute

6 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Thu, 28 Mar 2019 21:16:51 +0000 (00:16 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Allow incomplete array variables - extern const char * const sys_errlist[]

6 years agoAllow incomplete array variables - extern const char * const sys_errlist[]
Dmitry Stogov [Thu, 28 Mar 2019 21:15:12 +0000 (00:15 +0300)]
Allow incomplete array variables - extern const char * const sys_errlist[]

6 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Thu, 28 Mar 2019 21:03:18 +0000 (00:03 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #77768 (FFI: Builtin Types Should Not Raise Error On Redeclaration)

6 years agoFixed bug #77768 (FFI: Builtin Types Should Not Raise Error On Redeclaration)
Dmitry Stogov [Thu, 28 Mar 2019 21:02:26 +0000 (00:02 +0300)]
Fixed bug #77768 (FFI: Builtin Types Should Not Raise Error On Redeclaration)

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Thu, 28 Mar 2019 16:45:02 +0000 (17:45 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove php7.spec.in file

6 years agoRemove php7.spec.in file
Peter Kokot [Wed, 27 Mar 2019 22:36:59 +0000 (23:36 +0100)]
Remove php7.spec.in file

RPM specification file was introduced via
7c2f1384d45876bbdef255c4a57301e6406f6964 for PHP to include official
RPM packages long time agon. With removal of the makerpm script via
3d51d4c90c77a30a7b88aae7184dcce4b6e26b07 and Linux repositories to
manage such updated and customized info in their repositories this file
is most likely not needed anymore.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 28 Mar 2019 09:15:06 +0000 (10:15 +0100)]
Merge branch 'PHP-7.4'

6 years agoAdd additional protected visibility prototype test
Nikita Popov [Thu, 28 Mar 2019 09:14:14 +0000 (10:14 +0100)]
Add additional protected visibility prototype test

See https://github.com/php/php-src/pull/3993 for context.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 28 Mar 2019 08:31:18 +0000 (09:31 +0100)]
Merge branch 'PHP-7.4'

6 years agoRevert "Switch to bison location tracking"
Nikita Popov [Thu, 28 Mar 2019 08:29:08 +0000 (09:29 +0100)]
Revert "Switch to bison location tracking"

This reverts commit e528762c1c59bc0bd0bd6d78246c14269630cf0f.

Dmitry reports that this has a non-trivial impact on parsing
overhead, especially on 32-bit systems. As we don't have a strong
need for this change right now, I'm reverting it.

See also comments on
https://github.com/php/php-src/commit/e528762c1c59bc0bd0bd6d78246c14269630cf0f.

6 years agoMerge branch 'PHP-7.4'
Stanislav Malyshev [Thu, 28 Mar 2019 07:45:52 +0000 (00:45 -0700)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Validate subject encoding in mb_split and mb_ereg_match
  Validate pattern against mbregex encoding
  SQLite3: add DEFENSIVE config for SQLite >= 3.26.0 as a mitigation strategy against potential security flaws

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Stanislav Malyshev [Thu, 28 Mar 2019 07:44:42 +0000 (00:44 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Validate subject encoding in mb_split and mb_ereg_match
  Validate pattern against mbregex encoding
  SQLite3: add DEFENSIVE config for SQLite >= 3.26.0 as a mitigation strategy against potential security flaws

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Stanislav Malyshev [Thu, 28 Mar 2019 07:37:36 +0000 (00:37 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Validate subject encoding in mb_split and mb_ereg_match
  Validate pattern against mbregex encoding
  SQLite3: add DEFENSIVE config for SQLite >= 3.26.0 as a mitigation strategy against potential security flaws

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Stanislav Malyshev [Thu, 28 Mar 2019 07:35:22 +0000 (00:35 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Validate subject encoding in mb_split and mb_ereg_match
  Validate pattern against mbregex encoding
  SQLite3: add DEFENSIVE config for SQLite >= 3.26.0 as a mitigation strategy against potential security flaws

6 years agoMerge branch 'PHP-7.4'
Joe Watkins [Thu, 28 Mar 2019 06:35:50 +0000 (07:35 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  fix build: readline support must be disabled by default in phpdbg

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Joe Watkins [Thu, 28 Mar 2019 06:35:33 +0000 (07:35 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  fix build: readline support must be disabled by default in phpdbg

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Joe Watkins [Thu, 28 Mar 2019 06:35:15 +0000 (07:35 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  fix build: readline support must be disabled by default in phpdbg

6 years agofix build: readline support must be disabled by default in phpdbg
Joe Watkins [Thu, 28 Mar 2019 06:34:45 +0000 (07:34 +0100)]
fix build: readline support must be disabled by default in phpdbg

6 years agoValidate subject encoding in mb_split and mb_ereg_match
Nikita Popov [Mon, 11 Feb 2019 11:31:59 +0000 (12:31 +0100)]
Validate subject encoding in mb_split and mb_ereg_match

We were already validating the subject encoding in most functions,
but not these two.

6 years agoValidate pattern against mbregex encoding
Nikita Popov [Mon, 11 Feb 2019 11:10:40 +0000 (12:10 +0100)]
Validate pattern against mbregex encoding

Oniguruma does not consistently perform this validation itself (at least
on older versions), so make sure we check pattern encoding validity on the
PHP side.

6 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Thu, 28 Mar 2019 00:01:58 +0000 (03:01 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Support for __restrict and few GCC attributes

6 years agoSupport for __restrict and few GCC attributes
Dmitry Stogov [Thu, 28 Mar 2019 00:01:20 +0000 (03:01 +0300)]
Support for __restrict and few GCC attributes

6 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Wed, 27 Mar 2019 22:22:11 +0000 (01:22 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Use semantic predicates to simplify lookahead and reduce backtracking

6 years agoUse semantic predicates to simplify lookahead and reduce backtracking
Dmitry Stogov [Wed, 27 Mar 2019 22:21:06 +0000 (01:21 +0300)]
Use semantic predicates to simplify lookahead and reduce backtracking

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 27 Mar 2019 17:11:00 +0000 (18:11 +0100)]
Merge branch 'PHP-7.4'

6 years agoTreat abstract ctors the same, regardless of origin
Nikita Popov [Wed, 27 Mar 2019 17:09:09 +0000 (18:09 +0100)]
Treat abstract ctors the same, regardless of origin

Abstract ctor signatures should always be respected by all children,
independently of whether it comes from an interface or an abstract
class. Previously abstract ctor signatures (if they didn't come from
an interface) were only checked to one level of inheritance.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 27 Mar 2019 12:05:04 +0000 (13:05 +0100)]
Merge branch 'PHP-7.4'

6 years agoFix lineno for more inheritance errors
Nikita Popov [Wed, 27 Mar 2019 12:02:28 +0000 (13:02 +0100)]
Fix lineno for more inheritance errors

And also include explicit linenos in tests.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 27 Mar 2019 11:43:23 +0000 (12:43 +0100)]
Merge branch 'PHP-7.4'

6 years agoMake line numbers for inheritance errors more precise
Nikita Popov [Wed, 27 Mar 2019 11:42:35 +0000 (12:42 +0100)]
Make line numbers for inheritance errors more precise

Use the line of the conflicting child method, rather than either the
first or last line of the class.

6 years agoMerge branch 'PHP-7.4'
Joe Watkins [Wed, 27 Mar 2019 09:39:04 +0000 (10:39 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Consider phpdbg as cli

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Joe Watkins [Wed, 27 Mar 2019 09:38:56 +0000 (10:38 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Consider phpdbg as cli

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Joe Watkins [Wed, 27 Mar 2019 09:38:45 +0000 (10:38 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Consider phpdbg as cli

6 years agoConsider phpdbg as cli
Samuele Kaplun [Tue, 18 Sep 2018 12:49:36 +0000 (14:49 +0200)]
Consider phpdbg as cli

* When configuring extensions, considers the PHPDBG SAPI as CLI thus
  allowing e.g. to have the pcntl extension available within PHPDBG.

Signed-off-by: Samuele Kaplun <kaplun@protonmail.com>
6 years agoMerge branch 'PHP-7.4' of git://github.com/php/php-src into PHP-7.4
Joe Watkins [Wed, 27 Mar 2019 09:09:34 +0000 (10:09 +0100)]
Merge branch 'PHP-7.4' of git://github.com/php/php-src into PHP-7.4

6 years agoMerge branch 'master' of git://github.com/php/php-src
Joe Watkins [Wed, 27 Mar 2019 09:09:10 +0000 (10:09 +0100)]
Merge branch 'master' of git://github.com/php/php-src

6 years agoMerge branch 'PHP-7.4'
Joe Watkins [Wed, 27 Mar 2019 09:04:47 +0000 (10:04 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #77805 phpdbg build fails when readline is shared

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Joe Watkins [Wed, 27 Mar 2019 09:04:18 +0000 (10:04 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #77805 phpdbg build fails when readline is shared