Skip to content

sync #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 87 commits into from
Dec 14, 2022
Merged

sync #20

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
bcc0030
Updated to version 2022.7 (2022g)
derickr Nov 29, 2022
6f71697
Empty merge
derickr Nov 29, 2022
e568f93
Updated to version 2022.7 (2022g)
derickr Nov 29, 2022
ac1b232
Empty merge
derickr Nov 29, 2022
ebde5d3
Updated to version 2022.7 (2022g)
derickr Nov 29, 2022
44377c3
Fix GH-9971: Incorrect NUMERIC value returned from PDO_Firebird
cmb69 Nov 29, 2022
e29ca36
Merge branch 'PHP-8.1' into PHP-8.2
cmb69 Nov 30, 2022
7402d90
Merge branch 'PHP-8.2'
cmb69 Nov 30, 2022
818b46a
Import timelib 2021.18
derickr Nov 30, 2022
d021851
Fixed GH-9699, GH-9866, and GH-9880 (problems with diff); and GH-9700…
derickr Nov 30, 2022
64f5f53
Merge remote-tracking branch 'derickr/timelib-2021.18' into PHP-8.1
derickr Nov 30, 2022
83b714d
Merge branch 'PHP-8.1' into PHP-8.2
derickr Nov 30, 2022
f9ef2db
Merge branch 'PHP-8.2'
derickr Nov 30, 2022
41fef8b
Import timelib 2022.03
derickr Nov 30, 2022
d6ac533
Merge branch 'PHP-8.2'
derickr Nov 30, 2022
c87c803
Some (old, backwards compatible) TZIDs can have numbers in them
derickr Dec 1, 2022
29f0f4e
Merge branch 'regression-tzid-with-numbers' into PHP-8.1
derickr Dec 1, 2022
1316a5b
Merge branch 'PHP-8.1' into PHP-8.2
derickr Dec 1, 2022
853e9ca
Merge branch 'PHP-8.2'
derickr Dec 1, 2022
d4c804b
[ci skip] Add missing entries to php.ini quick reference
cmb69 Dec 1, 2022
683d81e
Fix incorrect short-circuiting in constant expressions (#10030)
iluuu1994 Dec 1, 2022
93592ea
Fix GH-9769: Misleading error message for unpacking of objects
jhdxr Nov 17, 2022
6b1f4c5
Merge branch 'PHP-8.1' into PHP-8.2
cmb69 Dec 2, 2022
9f0e4a5
Merge branch 'PHP-8.2'
cmb69 Dec 2, 2022
c4a0fc6
Fix zend_fcc_equals() with trampolines (#10012)
Girgias Dec 2, 2022
608ddb0
Fix GH-10011 (Trampoline autoloader will get reregistered and cannot …
Girgias Dec 2, 2022
334d108
Merge branch 'PHP-8.1' into PHP-8.2
Girgias Dec 2, 2022
d952419
Merge branch 'PHP-8.2'
Girgias Dec 2, 2022
adc2382
Fallback to first line of function when ex->opline is NULL (#10003)
arnaud-lb Dec 2, 2022
b683a7e
Merge branch 'PHP-8.1' into PHP-8.2
cmb69 Dec 5, 2022
6109b80
Merge branch 'PHP-8.2'
cmb69 Dec 5, 2022
b6b4a62
ext/mysqli tests "using password" optional in error messages
grooverdan Dec 2, 2022
0ac9e8e
Merge branch 'PHP-8.1' into PHP-8.2
cmb69 Dec 5, 2022
4ae1f08
Merge branch 'PHP-8.2'
cmb69 Dec 5, 2022
e4ef394
Drop superfluous check for imap_stream
cmb69 Dec 5, 2022
2f6b9e6
Fix #81742: open_basedir bypass in SQLite3 by using file URI
cmb69 Dec 5, 2022
8301803
Merge branch 'PHP-8.1' into PHP-8.2
cmb69 Dec 6, 2022
568ed47
Merge branch 'PHP-8.2'
cmb69 Dec 6, 2022
696bb38
PHP-8.1 is now for PHP 8.1.15-dev
ramsey Dec 7, 2022
35a4950
Replace Azure DevOps link with GitHub Actions
ramsey Dec 7, 2022
11b612a
Rename PHP_STREAM_TO_ZVAL to PHP_STREAM_FROM_ZVAL (#10065)
nielsdos Dec 7, 2022
3f3c1df
[ci skip] Fix GH-10056: [grammar] "less security-conscience applicati…
cmb69 Dec 8, 2022
01eabdc
[ci skip] Merge branch 'PHP-8.1' into PHP-8.2
cmb69 Dec 8, 2022
b628989
[ci skip] Merge branch 'PHP-8.2'
cmb69 Dec 8, 2022
c21a592
ext/mysqli tests "using password" optional in error messages (part 2)
grooverdan Dec 7, 2022
a76bbd3
Merge branch 'PHP-8.1' into PHP-8.2
cmb69 Dec 8, 2022
005a765
Merge branch 'PHP-8.2'
cmb69 Dec 8, 2022
faef55d
standard/basic_functions.c remove x bit on this file (#10069)
devnexen Dec 9, 2022
a1a69c3
Support Microsoft's "Best Fit" mappings for Windows-1252 text encoding
alexdowad Dec 6, 2022
b79a86f
Merge branch 'PHP-8.1' into PHP-8.2
alexdowad Dec 9, 2022
14110bf
Merge branch 'PHP-8.2'
alexdowad Dec 9, 2022
b77edf8
Fix mysqli test wrt. MariaDB
grooverdan Dec 1, 2022
1b503a1
Merge branch 'PHP-8.2'
cmb69 Dec 9, 2022
ac3ecd0
Add `Randomizer::getBytesFromString()` method (#9664)
joshuaruesweg Dec 9, 2022
16ce751
[ci skip] Add json_validate() RFC link to UPGRADING
TimWolla Dec 9, 2022
b34cdc5
[ci skip] Fix json_validate() formatting in NEWS
TimWolla Dec 9, 2022
6422cf6
intl extension: msgfmt_set_pattern add pattern format error informati…
devnexen Nov 27, 2022
e114f32
Avoid code duplication in php_ini.c (#4512)
glensc Dec 10, 2022
8a221e2
fix litespeed SAPI build warnings.
devnexen Dec 10, 2022
91e70a4
Merge branch 'PHP-8.2'
devnexen Dec 10, 2022
a839230
Fix compilation on RHEL 7 ppc64le (gcc 4.8)
ellert Nov 30, 2021
b96b88b
Merge branch 'PHP-8.2'
iluuu1994 Dec 11, 2022
0c0774f
Use fast text conversion filters for mb_strpos, mb_stripos, mb_substr…
alexdowad Oct 4, 2022
b3d197d
Optimize SJIS decoder for speed
alexdowad Dec 2, 2022
4072a76
Move MacJapanese implementation into mbfilter_sjis.c
alexdowad Dec 3, 2022
005e49e
Optimize MacJapanese decoder for speed
alexdowad Dec 3, 2022
4ebfddf
Move mobile variants of SJIS into mbfilter_sjis.c
alexdowad Dec 3, 2022
43cdfa3
Optimize SJIS-Mobile#DOCOMO decoder for speed
alexdowad Dec 3, 2022
6bf0c44
Optimize SJIS-Mobile#KDDI decoder for speed
alexdowad Dec 3, 2022
e36c600
Optimize SJIS-Mobile#SOFTBANK decoder for speed
alexdowad Dec 4, 2022
3be2b0d
Add CLEAN section to some IO tests (#10081)
Girgias Dec 12, 2022
fa3bbf0
Fix borked Windows tests after 3be2b0d0d83702db409bfcc3fbb4a176d565932d
Girgias Dec 12, 2022
3fb7198
intl extension, follow up on #10006 for numfmt_set_pattern
devnexen Dec 9, 2022
c5ab727
[skip ci] Change status of BCMath into Maintained (#10089)
frederikbosch Dec 13, 2022
3ab18d4
Change if (stack) check to an assertion (#10090)
nielsdos Dec 13, 2022
aef7d81
Fix GH-9949: Partial content on incomplete POST request
cmb69 Dec 6, 2022
87c2f5b
Merge branch 'PHP-8.1' into PHP-8.2
cmb69 Dec 13, 2022
2ca03be
Merge branch 'PHP-8.2'
cmb69 Dec 13, 2022
7a983e2
Fix Windows shmget() wrt. IPC_PRIVATE
TysonAndre Nov 15, 2022
9089e15
Merge branch 'PHP-8.1' into PHP-8.2
cmb69 Dec 13, 2022
b593b53
Merge branch 'PHP-8.2'
cmb69 Dec 13, 2022
4631e9d
shmget() with IPC_CREAT must not create 0 size SHM
cmb69 Dec 13, 2022
f8ff105
Merge branch 'PHP-8.2'
cmb69 Dec 13, 2022
52a891a
Add a new imap_is_open() function to check that a connection object i…
Girgias Dec 13, 2022
4a36513
Merge branch 'PHP-8.2'
Girgias Dec 13, 2022
002d54d
PHP-8.2 is now for PHP 8.2.2-dev
adoy Dec 14, 2022
2f119c3
Merge branch 'PHP-8.2'
adoy Dec 14, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ext/mysqli tests "using password" optional in error messages
Closes phpGH-10035.
  • Loading branch information
grooverdan authored and cmb69 committed Dec 5, 2022
commit b6b4a628a5009024f9abca664f6a25d64b6f64d6
4 changes: 2 additions & 2 deletions ext/mysqli/tests/mysqli_connect_oo.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,9 @@ require_once('skipifconnectfailure.inc');
print "done!";
?>
--EXPECTF--
Warning: mysqli::__construct(): (%s/%d): Access denied for user '%sunknown%s'@'%s' (using password: %s) in %s on line %d
Warning: mysqli::__construct(): (%s/%d): Access denied for user '%sunknown%s'@'%s' %r(\(using password: \w+\) ){0,1}%rin %s on line %d
mysqli object is not fully initialized
mysqli object is not fully initialized
... and now Exceptions
Access denied for user '%s'@'%s' (using password: %s)
Access denied for user '%s'@'%s'%r( \(using password: \w+\)){0,1}%r
done!
2 changes: 1 addition & 1 deletion ext/mysqli/tests/mysqli_real_connect.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ mysqli.allow_local_infile=1
require_once("clean_table.inc");
?>
--EXPECTF--
Warning: mysqli_real_connect(): (%s/%d): Access denied for user '%s'@'%s' (using password: YES) in %s on line %d
Warning: mysqli_real_connect(): (%s/%d): Access denied for user '%s'@'%s' %r(\(using password: \w+\) ){0,1}%rin %s on line %d
object(mysqli)#%d (%d) {
["client_info"]=>
string(%d) "%s"
Expand Down
2 changes: 1 addition & 1 deletion ext/mysqli/tests/mysqli_real_connect_pconn.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -152,5 +152,5 @@ mysqli.max_persistent=10
require_once("clean_table.inc");
?>
--EXPECTF--
Warning: mysqli_real_connect(): (%s/%d): Access denied for user '%s'@'%s' (using password: YES) in %s on line %d
Warning: mysqli_real_connect(): (%s/%d): Access denied for user '%s'@'%s' %r(\(using password: \w+\) ){0,1}%rin %s on line %d
done!
4 changes: 2 additions & 2 deletions ext/mysqli/tests/mysqli_report.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,6 @@ Warning: mysqli_stmt_attr_set(): (%s/%d): Not implemented in %s on line %d
mysqli_kill(): Argument #2 ($process_id) must be greater than 0

Warning: mysqli_stmt_prepare(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'FOO' at line 1 in %s on line %d
[013] Access denied for user '%s'@'%s' (using password: YES)
[016] Access denied for user '%s'@'%s' (using password: YES)
[013] Access denied for user '%s'@'%s'%r( \(using password: \w+\)){0,1}%r
[016] Access denied for user '%s'@'%s'%r( \(using password: \w+\)){0,1}%r
done!