Commit graph

171 commits

Author SHA1 Message Date
Nikita Popov
5af586bec5 Remove more PHP 6 leftovers from tests 2016-11-24 22:39:39 +01:00
Nikita Popov
45f7b2bcc8 Fix CRLF line-endings in tests
Also fix a single instance of CRLF in ibase_query.c.
2016-11-20 22:31:24 +01:00
Christoph M. Becker
1ccada35c0 Fix tests: don't count non-countables 2016-11-13 18:16:17 +01:00
Christoph M. Becker
e8e41aa8cd Merge branch 'PHP-7.0' into PHP-7.1 2016-09-09 14:43:16 +02:00
Christoph M. Becker
1a30a7a422 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-09 14:34:11 +02:00
Christoph M. Becker
23e721fc93 Fix #73054: default option ignored when object passed to int filter
If an object that can't be converted to string is validated, we must not
bail out early, but rather check for a requested default value.
2016-09-09 14:30:24 +02:00
Levi Morrison
cb91a51b00 Partially fix bug #67167 - Wrong return value...
...from FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE

The remainer of the fix would require the filter functions to only
convert to string when it makes sense for that particular filter.

(cherry picked from commit 432dc527ad)
2016-09-09 12:45:46 +02:00
Julien Pauli
376dcaa39a Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE
2016-09-05 10:13:19 +02:00
Julien Pauli
e5047ac2d2 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE
2016-09-05 10:12:49 +02:00
Julien Pauli
9834978a8b Fix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE 2016-09-05 10:08:42 +02:00
Sjon Hortensius
66626cc223 Fix typos, previous version used reserver/reserverd/reserved 2016-07-23 23:14:14 +02:00
Anatol Belski
7f3375d5f2 make constant name more descriptive 2016-07-18 23:33:22 +02:00
Leo Feyer
8f4050709c Support Unicode characters in the local part of an e-mail address.
See RFC 6531 (https://tools.ietf.org/html/rfc6531).

Encode IDNA domains.

Add the missing "Done" to the expected output.

Add the FILTER_FLAG_EMAIL_RFC6531 flag.

Fix the filter_var() call.
2016-07-18 21:52:35 +02:00
Julien Pauli
13a5c54068 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Updated NEWS
  update filter_var filters for ipv4 addresses to reflect rfc6890
2016-07-08 16:31:53 +02:00
Jos Elstgeest
6fc7817558 update filter_var filters for ipv4 addresses to reflect rfc6890 2016-07-08 16:30:06 +02:00
Xinchen Hui
a9026070b6 Fixed test 2015-12-12 22:37:50 -08:00
Xinchen Hui
c47b49c9b5 Fixed test if PATH is not set 2015-12-08 08:26:04 -08:00
Reeze Xia
3427c122bf Fixed bug #71063 (filter_input(INPUT_ENV, ..) does not work) 2015-12-09 00:04:12 +08:00
Levi Morrison
432dc527ad Partially fix bug #67167 - Wrong return value...
...from FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE

The remainer of the fix would require the filter functions to only
convert to string when it makes sense for that particular filter.
2015-09-02 18:23:26 -06:00
Levi Morrison
730496b899 Skip if ext/filter isn't loaded 2015-09-02 10:12:08 -06:00
Nikita Popov
547d387973 Merge branch 'PHP-5.6' 2015-03-14 09:18:50 +01:00
Jeff Welch
1e51c5411e Fix #69203: FILTER_FLAG_STRIP_HIGH doesn't strip ASCII 127 2015-03-14 09:17:36 +01:00
Jeff Welch
fdbdb11514 Fix #69202: FILTER_FLAG_STRIP_BACKTICK ignored unless other flags are used. 2015-03-09 17:14:47 +08:00
Jeff Welch
66a2c528fe Fix #69202: FILTER_FLAG_STRIP_BACKTICK ignored unless other flags are used. 2015-03-09 17:08:35 +08:00
Jeff Welch
1dc5bd47d8 Adjust logic in sanity checks.
The code should return false when the provided options argument is neither an
array nor a valid filter.
2015-03-08 15:27:41 -04:00
Andrea Faulds
e5eb9530ab Use "float" and "integer" in typehint and zpp errors 2014-12-21 13:23:02 +00:00
Kévin Dunglas
54f06d2381 New label length test 2014-11-17 08:10:29 +01:00
Kévin Dunglas
a8742d30ea Fix ext/filter/tests/033.phpt 2014-11-14 11:40:39 +01:00
Kévin Dunglas
5ad3f87557 Fix filter_list test 2014-11-14 10:56:39 +01:00
Kévin Dunglas
728945d0a5 FILTER_VALIDATE_DOMAIN and RFC conformance for FILTER_VALIDATE_URL 2014-11-14 10:01:53 +01:00
Nikita Popov
43f1c94dda Review a few more SEPARATE_ZVAL_IF_NOT_REF usages 2014-10-09 12:51:05 +02:00
Ferenc Kovacs
c66a4e84bb Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  adding a reproduce script for bug #49184
2014-07-02 22:38:27 +02:00
Ferenc Kovacs
37a13d2df7 adding a reproduce script for bug #49184 2014-07-02 22:37:58 +02:00
Adam Harvey
6f52f566f3 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
2013-12-03 14:51:03 -08:00
Adam Harvey
d1314893fd Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
These were returned to the general allocation pool by RFC 3330, and hence
shouldn't cause an IP address validation failure due to being reserved. At
least 128.0.0.0/16 is in use on the public Internet today.

Fixes bug #66229 (128.0.0.0/16 isn't reserved any longer).
2013-12-03 14:46:15 -08:00
Rasmus Lerdorf
55b16f40a2 Merge branch 'pull-request/499'
Fix RFC 6598 IPv4 Reserved Range Checks
2013-10-19 00:43:21 -07:00
Rasmus Lerdorf
6919d15a2e Merge branch 'pull-request/499'
Fix RFC 6598 IPv4 Reserved Range Checks
2013-10-19 00:42:53 -07:00
David Soria Parra
5e3da04fb0 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses
2013-09-17 09:55:03 +02:00
Sebastian Nohn
7c279df6ae Add RFC 6598 IPs to reserved addresses
(cherry picked from commit b3f5b822e9)
2013-09-17 09:52:53 +02:00
David Soria Parra
3d6ac70e66 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  NEWS for #60577
  NEWS for bug #64441
  Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
  EmptyIterator now implements Countable; fixes bug 60577
  News for bugfix #64157
  Bug 64157 Changed error message to make sense
2013-09-16 23:36:37 +02:00
Alex Bobrov
18b54a2366 Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
(cherry picked from commit c149d4ee4be81ecf005eafd43ede06e70aa4c985)
2013-09-16 05:23:52 +02:00
Xinchen Hui
b3f6cc20e0 Merge branch 'PHP-5.4' into PHP-5.5 2013-05-09 15:57:44 +08:00
Xinchen Hui
699dc04c55 Missed SKIPIF 2013-05-09 15:57:25 +08:00
Martin Jansen
6186b67600 Add option to specific the expected separator character. 2013-02-03 13:23:54 +01:00
Martin Jansen
2f33443883 ext/filter support for validating MAC addresses. 2013-02-03 13:23:53 +01:00
Martin Jansen
dcd99c4b19 Add more tests for the new +0/-0 behaviour. 2012-12-29 03:31:22 +01:00
Martin Jansen
3990641e62 Treat "+0" and "-0" as valid integers just like var_dump() does.
This fixes bug #54096.
2012-12-29 03:31:13 +01:00
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Lars Strojny
a26390ef0c Bug #49510: Boolean validation fails with FILTER_NULL_ON_FAILURE with empty string or false 2012-09-02 22:10:23 +02:00