clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
117,058 Commits 491 Branches 1,363 Tags 839 MiB
7232779fca
Commit Graph

117058 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph M. Becker
7232779fca Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #79106: PDO may fetch wrong column indexes with PDO::FETCH_BOTH
 2020-01-13 18:49:38 +01:00
Christoph M. Becker
ed78c6dbae Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79106: PDO may fetch wrong column indexes with PDO::FETCH_BOTH
 2020-01-13 18:48:55 +01:00
Christoph M. Becker
30ce242435 Fix #79106: PDO may fetch wrong column indexes with PDO::FETCH_BOTH 
Column names can be numeric strings, so we have to make sure to insert
the column values with the appropriate numeric keys, instead of adding
them.
 2020-01-13 18:47:54 +01:00
Dmitry Stogov
8ee04946f0 typo 2020-01-13 16:25:42 +03:00
Christoph M. Becker
8ea190ba95 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #79084: mysqlnd may fetch wrong column indexes with MYSQLI_BOTH
 2020-01-13 13:24:12 +01:00
Christoph M. Becker
b0cdd8cc53 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79084: mysqlnd may fetch wrong column indexes with MYSQLI_BOTH
 2020-01-13 13:23:12 +01:00
Christoph M. Becker
1752393bb4 Fix #79084: mysqlnd may fetch wrong column indexes with MYSQLI_BOTH 
Column names can be numeric strings, so we have to make sure to insert
the column values with the appropriate numeric keys, instead of adding
them.
 2020-01-13 13:21:45 +01:00
Nikita Popov
dc02e68f77 Try to fix ZTS build 2020-01-13 13:12:55 +01:00
Nikita Popov
d2110e9880 Use helper in one more place 2020-01-13 12:44:16 +01:00
Nikita Popov
862a4f3a5e Fix build 2020-01-13 12:42:51 +01:00
Dmitry Stogov
27815959e1 Improve access to zend_map_ptr data 2020-01-13 14:27:35 +03:00
Nikita Popov
1caf0951a0 Handle one more case I missed 2020-01-13 12:06:23 +01:00
Nikita Popov
5d869df753 Make class name references use the class_name production 
Throw a compile error for "static" references instead, where it
isn't already the case.

Also extract the code that does that -- we have quite a few places
where we get a const class ref and require it to be default.
 2020-01-13 11:51:09 +01:00
Nikita Popov
2a3e37a496 Don't use yystrlen() 
This is unnecessary and not available when GLR is used.
 2020-01-13 11:23:30 +01:00
Islam Israfilov
f553e676ec Fixed #78385: Distinguish absent/empty query/fragment 
http://example.com/foo   => query = null, fragment = null
http://example.com/foo?  => query = "",   fragment = null
http://example.com/foo#  => query = null, fragment = ""
http://example.com/foo?# => query = "",   fragment = ""

Closes GH-5078.
 2020-01-13 10:18:23 +01:00
Nikita Popov
4388add2c8 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix test
 2020-01-13 10:10:16 +01:00
Nikita Popov
c247898949 Fix test 
Hopefully (32-bit)
 2020-01-13 10:09:58 +01:00
Christoph M. Becker
c1519321e7 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Bring back test case support for older MySQL versions
 2020-01-11 11:22:30 +01:00
Christoph M. Becker
0ab53f1636 Bring back test case support for older MySQL versions 
These test cases have recently been adjusted to work with MySQL 8[1],
but some older, but still supported database versions, such as MySQL
5.6, still need the password to be sent hashed, so we fall back to
using `PASSWORD()`, if the `SET PASSWORD` query fails without it.

[1] <http://git.php.net/?p=php-src.git;a=commit;h=b0efd18f7844da29931737b8a1cf461c7493e168>.
 2020-01-11 11:21:26 +01:00
George Peter Banyard
1589266f85 Remove dead code and unused DEFINEs 
Closes GH-5073
 2020-01-10 22:24:15 +01:00
Christoph M. Becker
7c76126841 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix test cases which fail on Windows debug builds
 2020-01-10 20:02:16 +01:00
Christoph M. Becker
1ef8d5d65b Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix test cases which fail on Windows debug builds
 2020-01-10 20:01:28 +01:00
Christoph M. Becker
f6dea34831 Fix test cases which fail on Windows debug builds 
We use the portable {TMP} instead of the hard-coded /tmp, and skip
mysqli_debug_append.phpt on Windows, because unlinking the trace file
while the connection is still open won't work there.

(cherry picked from commit 60081ca20d)
 2020-01-10 20:00:31 +01:00
Nikita Popov
ddc5553ecd Merge branch 'PHP-7.4' 
* PHP-7.4:
  Remove unnecessary whitespace sensitivtiy from some tests
 2020-01-10 17:38:39 +01:00
Nikita Popov
e748a5a0e6 Remove unnecessary whitespace sensitivtiy from some tests 2020-01-10 17:36:46 +01:00
Christoph M. Becker
f91dbac9ae Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix test for Windows ZTS builds
 2020-01-11 06:17:37 +14:00
Christoph M. Becker
e8a86b1a00 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix test for Windows ZTS builds
 2020-01-11 06:16:03 +14:00
Christoph M. Becker
bc529b92ee Fix test for Windows ZTS builds 
Cf. <https://bugs.php.net/bug.php?id=61685#1578672905>.
 2020-01-11 06:15:32 +14:00
Nikita Popov
7ce531f2c2 Make constant() error handling consistent with plain const lookup 
This means we get an Error exception and a much better error
message indicating the root cause (e.g. accessing a private class
constant).
 2020-01-10 13:39:56 +01:00
Nikita Popov
0a2f6c5527 Move undefined constant error into get_constant_ex 
All the other error conditions are already handled in there, so
this one should be as well.
 2020-01-10 11:48:10 +01:00
George Peter Banyard
b79efec994 Remove unused delimiter parameter in php_fgetcsv_lookup_trailing_spaces subroutine. 2020-01-10 03:38:16 +01:00
Christoph M. Becker
f6c9319bec Merge branch 'PHP-7.4' 
* PHP-7.4:
  Silence potential taskkill error messages
 2020-01-09 19:03:43 +01:00
Christoph M. Becker
bf629baa9c Silence potential taskkill error messages 
That test is still intermittently failing, because failure to kill the
child process is reported.  Therefore we silence these error messages.
 2020-01-09 19:01:37 +01:00
Nikita Popov
55618ff118 Convert infallible mysqli checks to asserts 2020-01-09 18:56:30 +01:00
Nikita Popov
307dd465c1 Remove unused MYSQLI_STATUS_CLEARED 2020-01-09 18:56:30 +01:00
Christoph M. Becker
c13077a895 Fix test 
The typo in the echoed string had been fixed in master; fix the
expectation as well.
 2020-01-09 18:40:58 +01:00
Christoph M. Becker
b2aac6cc3a Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix useless tests
 2020-01-09 17:44:41 +01:00
Christoph M. Becker
cfa9e5e05e Fix useless tests 
These tests are certainly not supposed to fail due to a typo in the
class names, but expect this failure.  We fix the typos and the
expectations.
 2020-01-09 17:42:22 +01:00
Christoph M. Becker
f1e00033e6 Allows further tests to run on Windows 2020-01-09 12:04:29 +01:00
Christoph M. Becker
718fc4cefd Use IS_WINDOWS 2020-01-09 12:04:28 +01:00
Christoph M. Becker
10c420f84a Replace fakemail with minimal PHP script 2020-01-09 12:04:28 +01:00
Christoph M. Becker
64633044c5 Unify mail related tests for *nix and Windows 
Currently mail related tests are split for *nix and Windows (if there
are even Windows versions).  The basic difference is that the *nix
variants set the INI directive sendmail_path to just write the email to
disk, while the Windows tests use ext/imap.  The latter tests are way
more verbose, and such duplicated tests are generally a pain point.
Furthermore, the Windows tests are much slower, and could not be run
without ext/imap being available.

We therefore introduce a small fakemail application, which basically
works like `tee <path> >/dev/null`, and which will be shipped with the
Windows tests packs.  fakemail.exe would also need to be added to the
PHP binary SDK, so these tests could be run during developments.

To cater to the remaining differences, we also introduce support for
`{MAIL:<path>}` placeholders in the INI sections to run-tests.php.  How
to use this can be seen in mail_basic.phpt, which is currently the only
modified test case, because these tests are yet supposed to fail on
Windows, due to the missing fakemail.exe in the PHP SDK.
 2020-01-09 12:04:28 +01:00
Nikita Popov
0a9bdd6e7b Merge branch 'PHP-7.4' 
* PHP-7.4:
  Increase select timeout in FPM tester
 2020-01-09 10:20:28 +01:00
Nikita Popov
b3cc30adf8 Increase select timeout in FPM tester 
Let's see if that helps with the recent failure spree on Azure.
 2020-01-09 10:19:02 +01:00
Christoph M. Becker
aa5a24d6fc Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #79086: Bump version not applied
 2020-01-09 09:26:58 +01:00
Christoph M. Becker
d684f5fdc0 Fix #79086: Bump version not applied 
We must not forget to update the version in configure.ac as well.
 2020-01-09 09:25:52 +01:00
George Peter Banyard
b670823749 Convert some warnings to Errors in BZip2 
Closes GH-4984
 2020-01-09 00:58:12 +01:00
George Peter Banyard
928afd8fb7 Convert some warnings to Error in zlib extension 
Closes GH-4985
 2020-01-09 00:56:58 +01:00
George Peter Banyard
66659d6cf6 [ci skip] Update UPGRADING 2020-01-09 00:38:47 +01:00
Christoph M. Becker
5836c7063b Avoid superfluous assignments 
These values are already set via the initializers.
 2020-01-09 00:17:14 +01:00