php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 09:12:14 +01:00
Code Issues Packages Projects Releases Wiki Activity
118,795 Commits 547 Branches 1,481 Tags
cebe750f460b8060ab21ae1e21980098f3f5b8e2
Commit Graph

1848 Commits

Author SHA1 Message Date
George Peter Banyard
68164f40ce Fix [-Wundef] warning in MBString extension 2020-05-16 15:31:20 +02:00
George Peter Banyard
7dd332f110 Refactor mb_substitute_character() 
Using the new Fast ZPP API for string|int|null

This also fixes Bug #79448 which was too disruptive to fix in PHP 7.x
 2020-05-11 17:30:01 +02:00
Nikita Popov
d38f819647 Fix test file encoding 
The mb_http_input_pass.phpt was intended to use the same encoding
as mb_http_input.phpt, not UTF-8.
 2020-05-07 21:18:49 +02:00
Nikita Popov
481b7421f3 Throw warning if invalid internal_encoding ini is specified 2020-05-07 14:44:13 +02:00
Nikita Popov
217f6013b3 Remove no_language from mbfl_string 
This is not actually used for anything and just causes confusion.
 2020-05-07 11:36:57 +02:00
Nikita Popov
226d9dd30a Only allow "pass" as input/output encoding 
"pass" is not a real encoding, it just means "don't perform any
conversion". Using it as an internal encoding or passing it to
any of the mbstring() function will not work (and on master commonly
assert).
 2020-05-07 11:19:14 +02:00
Nikita Popov
5bfa9598f4 Return false from failed mb_convert_variables() 
If we fail to detect the encoding return false, just like
mb_convert_encoding() does, and the implementation here clearly
intended. Previously the "pass" pseudo-incoding was returned.
 2020-05-07 10:16:46 +02:00
Nikita Popov
71f48260af Fix assertion failure when failing to detect encoding 
Looks like prior to 7.3 this just passed the original string
through. Since 7.3 it returns false. Let's stick with that
behavior.
 2020-05-06 22:56:01 +02:00
Nikita Popov
901417f0ae Fix mbfl default allocators 
Forgot to remove the persistent allocators from here.
 2020-05-04 23:41:39 +02:00
Nikita Popov
a0cae937c5 Spec mbfl allocators as infallible 
And remove all NULL checks.
 2020-05-04 23:19:07 +02:00
Nikita Popov
7d4ff8443e Remove persistent allocators from libmbfl 
These functions are not used, and I don't think we have any plans
to ever use them.
 2020-05-04 23:19:07 +02:00
Máté Kocsis
6111d64cda Improve a last couple of argument error messages 
Closes GH-5404
 2020-04-20 13:09:00 +02:00
George Peter Banyard
2a4c81f1ee Fix [-Wjump-misses-init] in php_mbregex.c by adding an inner scope 2020-04-18 14:52:48 +02:00
Máté Kocsis
1f48feebb9 Improve some TypeError and ValueError messages 
Closes GH-5377
 2020-04-14 14:38:45 +02:00
George Peter Banyard
01762e56ed Adapt assertion as mbfl_strwidth returns a size_t 2020-04-12 19:34:05 +02:00
George Peter Banyard
3eba187b15 Refactor and remove dead code in mb_ereg(i)_replace 
We do not support the 'e' option anymore.
Merged together code which would emit an error if this option is present.
This also makes it clearer that the whole branch in the replacement section supporting this option is never hit, thus removed.
 2020-04-10 17:56:05 +02:00
George Peter Banyard
12ec7a2730 Convert if blocks to assertions and adapt stubs accordingly 2020-04-09 13:50:37 +02:00
George Peter Banyard
73455778d4 Cache MBFL encoding for Oniguruma regex functions. 
Closes GH-5355
 2020-04-09 13:48:55 +02:00
Máté Kocsis
3709e74b5e Store default parameter values of internal functions in arg info 
Closes GH-5353. From now on, PHP will have reflection information
about default values of parameters of internal functions.

Co-authored-by: Nikita Popov <nikita.ppv@gmail.com>
 2020-04-08 18:37:51 +02:00
Nikita Popov
38d93262a0 Update mb_strrpos() stub 
We no longer accept the encoding as 3rd param, so we can make this
a proper int argument.
 2020-04-08 12:03:14 +02:00
George Peter Banyard
1e8459d626 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Revert "Went to fast and forgot to update tests"
  Revert "Fix Bug #79448 0 is a valid Unicode codepoint, but mb_substitute_character(0) fails"
 2020-04-07 22:49:17 +02:00
George Peter Banyard
9b98cf3209 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Revert "Went to fast and forgot to update tests"
  Revert "Fix Bug #79448 0 is a valid Unicode codepoint, but mb_substitute_character(0) fails"
 2020-04-07 22:27:00 +02:00
George Peter Banyard
a0df5f3b54 Revert "Went to fast and forgot to update tests" 
This reverts commit 656eac74fa.
 2020-04-07 22:24:40 +02:00
George Peter Banyard
6031b08240 Revert "Fix Bug #79448 0 is a valid Unicode codepoint, but mb_substitute_character(0) fails" 
This commit brings some substantial changes in behaviour due to the weird implementation.
This will be fixed in master due to BC concerns.

This reverts commit 1333b46d6d.
 2020-04-07 22:23:24 +02:00
Máté Kocsis
21cfa03f17 Generate function entries for another batch of extensions 
Closes GH-5352
 2020-04-05 21:15:30 +02:00
George Peter Banyard
1b6f61e7c4 Promote invalid case mode to ValueError in mb_case_converter 
Add assertions to check the return value is not NULL as this indicates a bug.
Add identical assertion to mb_strtoupper and mb_strtolower.
This means these functions can't return false anymore, ammend stubs accordingly.
 2020-04-05 03:33:08 +02:00
George Peter Banyard
a34e73de5a mb_scrub() can't return false anymore 
Also drop the intermediary function which was only used here
 2020-04-05 01:44:39 +02:00
George Peter Banyard
07062e1fc5 Promote some warnings to ValueError in mbstring 
Promoted warnings are:
 * Empty encoding lists
 * Unknown language
 * Start and Width out of bound
 2020-04-05 01:44:38 +02:00
George Peter Banyard
bd52b62ae0 Convert some if blocks to assertions 2020-04-05 01:44:38 +02:00
George Peter Banyard
fc5a88f614 Merge branch 'PHP-7.4' 2020-04-03 22:23:03 +02:00
George Peter Banyard
c31b2bbd46 Merge branch 'PHP-7.3' into PHP-7.4 2020-04-03 22:10:56 +02:00
George Peter Banyard
656eac74fa Went to fast and forgot to update tests 
However due to the really lax conversion to integer all strings pass as 0
 2020-04-03 22:03:00 +02:00
George Peter Banyard
9cb9c53f1f Merge branch 'PHP-7.4' 2020-04-03 21:30:35 +02:00
George Peter Banyard
7a42611870 Merge branch 'PHP-7.3' into PHP-7.4 2020-04-03 21:28:07 +02:00
George Peter Banyard
1333b46d6d Fix Bug #79448 0 is a valid Unicode codepoint, but mb_substitute_character(0) fails 2020-04-03 21:18:45 +02:00
Christoph M. Becker
17d4e66204 Fix #68690: Hypothetical off-by-one condition 
We fix this, even though `filter->cache == jisx0213_u2_tbl_len` can
never be true here.
 2020-04-03 14:20:37 +02:00
George Peter Banyard
fa3b8c75fb Promote unknown encoding throws in encoding array/string list 
For the string list we emit still emit a warning by comparing arg_num to 0

Closes GH-5337
 2020-04-03 10:58:46 +02:00
George Peter Banyard
656046873c Refactor mb_substr_count() 
Promote empty needle warning to ValueError
Convert if branch into an assertion as if mbfl_substr_count fails this now implies a bug
Thus mb_substr_count() can only return int now, fix stubs accordingly
 2020-04-02 22:40:00 +02:00
George Peter Banyard
165fde9a37 Convert if branch to assertion in mb_strlen 
This operation should never fail, therefore it's converted to an assertion.
Thus this mb_strlen() can now only return int, fix stubs accordingly
 2020-04-02 22:40:00 +02:00
George Peter Banyard
d44ee9112f Promote mb_str_split warning to ValueError 
Also add a TODO about documenting this funcion on PHP.net
Convert some checks to assertions as if they don't hold something went wrong during memory allocation
Due to these changes this function cannot return false anymore, fix stubs accordingly
 2020-04-02 22:40:00 +02:00
George Peter Banyard
f488b5d0f9 Merge mb_strstr() variants under a common implementation 
This reduces heavy ducplicate code
 2020-04-02 22:40:00 +02:00
George Peter Banyard
737871341f Improve code flow 
These nested if-else blocks are unnecessary since we return early.
 2020-04-02 22:40:00 +02:00
George Peter Banyard
577de174de Use ZEND_NUM_ARGS() macro instead of custom variable 
Also why on earth would someone do this?
 2020-04-02 22:40:00 +02:00
George Peter Banyard
4cd3d7b166 Promote empty string warning to ValueError in mb_ord() 2020-04-02 22:39:59 +02:00
George Peter Banyard
a54ee6e591 Merge branch 'PHP-7.4' 2020-04-01 04:55:35 +02:00
George Peter Banyard
cc0052678a Merge branch 'PHP-7.3' into PHP-7.4 2020-04-01 04:34:09 +02:00
George Peter Banyard
18dc9044f5 Fix bug 79441 2020-04-01 04:29:20 +02:00
George Peter Banyard
229dff9f08 Promote unsupported encoding warnings to ValueError 2020-04-01 00:54:36 +02:00
George Peter Banyard
21227dc1f1 Use php_mb_get_encoding instead of mbfl_name2encoding to get encoding 
This reduces the number of places where the error message template is used.
Also promote the mb_check_encoding() warning to ValueError and add a test to cover the behaviour.
 2020-03-31 23:39:39 +02:00
Nikita Popov
11f0e1d1cb Move encoding fetching out of php_mb_convert_encoding() 2020-03-31 21:47:55 +02:00