Add array|int and object-of-class|int types to stubs #6081

kocsismate · 2020-09-04T23:10:42Z

After this PR, there is only ~270 parameters remaining whose type can't be added as a proper type declaration, not counting out parameters, parameters containing resource, and parameters in ext/dba, but including aliases.

Most of these are because of LSP violations (offset*() methods), but there are 70 funky GMP|int|bool|string param types in ext/gmp, so all in all, there is only a few cases where type validation is not exactly in line with the reported PHPDoc-based type. :)

Zend/zend_API.h

ext/date/php_date.c

ext/standard/basic_functions.stub.php

ext/filter/filter.stub.php

carusogabriel · 2020-09-05T12:05:21Z

Can we have a ZPP label? I believe that will help us to group these PRs for future read :)

kocsismate · 2020-09-07T19:21:28Z

I've just rebased to current master since there was a conflict. Additionally, I synchronized the signature of mb_send_mail() and mail() after today's changes in the latter function.

Zend/zend_API.h

ext/date/php_date.c

ext/filter/filter.stub.php

ext/date/php_date.c

Zend/zend_API.h

ext/date/php_date.c

ext/date/php_date.stub.php

ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt

Zend/zend_API.h

ext/filter/filter.stub.php

ext/intl/calendar/calendar_ce.h

ext/intl/dateformat/dateformat_create.cpp

nikic

Nearly there...

ext/filter/filter.c

nikic · 2020-09-13T15:39:57Z

ext/filter/filter.c

 	zval *options = NULL;
 	zval *option;
 	char *charset = NULL;

-	if (filter_args && Z_TYPE_P(filter_args) != IS_ARRAY) {
-		zend_long lval = zval_get_long(filter_args);
+	if (filter_args_long) {


Shouldn't the check here rather the !filter_args_ht?

This change would make 3 tests fail:

in ext/filter/tests/039.phpt: var_dump(filter_var_array(array())); would become false rather than array()

in ext/filter/tests/057.php: a bunch of things would change, e.g. var_dump(filter_input_array(INPUT_POST, null)); would print false, rather than null

ext/filter/tests/filter_var_array_with_ref.phpt would print false in the first line

Trying to figure this out now...

I've pushed some changes to ext/filter that hopefully make sense. I've also added a warning for the "unknown filter" case, which should make the changes in 057.phpt more obvious.

Any concerns about adding that warning?

Thanks for the fixes! This was a more bumpy road for me than what I imagined ^^

At first, I was a bit surprised about the new warnings (I thought that I accidentally removed them previously), but I agree that we should have them :)

ext/filter/filter.c

ext/date/php_date.c

No behavior difference here, but let's be consistent.

nikic · 2020-09-14T08:51:37Z

ext/date/tests/date_period_bad_iso_format.phpt

+<?php
+
+try {
+    $perid = new DatePeriod("R4");


Suggested change

$perid = new DatePeriod("R4");

$period = new DatePeriod("R4");

Or drop the variable :)

Ah, I don't even know why I added the variables in the first place... :) (I do know indeed: copy-pasted from date_interval_bad_format_leak.phpt)

You copied my typo :P

Fixed them during applying the changes in this PR :)

kocsismate marked this pull request as draft September 4, 2020 23:10

kocsismate force-pushed the more-accurate-types4 branch from 4186fd9 to 2f6722b Compare September 4, 2020 23:12

kocsismate commented Sep 4, 2020

View reviewed changes

Zend/zend_API.h Show resolved Hide resolved

ext/date/php_date.c Outdated Show resolved Hide resolved

ext/standard/basic_functions.stub.php Show resolved Hide resolved

kocsismate requested a review from derickr September 4, 2020 23:22

kocsismate force-pushed the more-accurate-types4 branch from 2f6722b to 64d48f7 Compare September 5, 2020 07:46

kocsismate marked this pull request as ready for review September 5, 2020 07:46

kocsismate force-pushed the more-accurate-types4 branch from 64d48f7 to 48e120b Compare September 5, 2020 08:47

kocsismate commented Sep 5, 2020

View reviewed changes

ext/filter/filter.stub.php Outdated Show resolved Hide resolved

kocsismate force-pushed the more-accurate-types4 branch 3 times, most recently from a4f2b03 to 87d1ae4 Compare September 7, 2020 19:20

nikic reviewed Sep 8, 2020

View reviewed changes

Zend/zend_API.h Outdated Show resolved Hide resolved

ext/date/php_date.c Outdated Show resolved Hide resolved

ext/filter/filter.stub.php Outdated Show resolved Hide resolved

ext/date/php_date.c Outdated Show resolved Hide resolved

kocsismate commented Sep 8, 2020

View reviewed changes

Zend/zend_API.h Show resolved Hide resolved

kocsismate force-pushed the more-accurate-types4 branch from 87d1ae4 to 0064d12 Compare September 9, 2020 09:21

kocsismate commented Sep 9, 2020

View reviewed changes

ext/date/php_date.c Show resolved Hide resolved

kocsismate force-pushed the more-accurate-types4 branch 3 times, most recently from ad28dd8 to d507919 Compare September 11, 2020 09:50

nikic reviewed Sep 11, 2020

View reviewed changes

ext/date/php_date.stub.php Outdated Show resolved Hide resolved

ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt Outdated Show resolved Hide resolved

nikic reviewed Sep 11, 2020

View reviewed changes

Zend/zend_API.h Outdated Show resolved Hide resolved

ext/filter/filter.stub.php Outdated Show resolved Hide resolved

ext/filter/filter.stub.php Outdated Show resolved Hide resolved

nikic reviewed Sep 11, 2020

View reviewed changes

ext/intl/calendar/calendar_ce.h Outdated Show resolved Hide resolved

ext/intl/dateformat/dateformat_create.cpp Outdated Show resolved Hide resolved

kocsismate force-pushed the more-accurate-types4 branch from d507919 to 813885f Compare September 11, 2020 12:27

kocsismate added 6 commits September 12, 2020 19:51

Add array|int and object-of-class|int types to stubs

9adde72

Sync mb_send_mail() signature with mail()

efba6cd

Make the error handling of DatePeriod::__construct() more clean

bd50198

Fix default value handling of session_set_cookie_params()

bace93f

Revert ZPP changes to DatePeriod::__construct()

2389f86

Code review - another round

6ae7e1d

nikic and others added 2 commits September 12, 2020 19:51

Add missing USE_CALENDAR_POINTER define

5907070

Fix default values in ext/filter

4281daa

kocsismate force-pushed the more-accurate-types4 branch from 9853823 to 4281daa Compare September 12, 2020 18:45

Another review

0cbe010

kocsismate force-pushed the more-accurate-types4 branch from a02d422 to 0cbe010 Compare September 13, 2020 15:12

nikic reviewed Sep 13, 2020

View reviewed changes

kocsismate force-pushed the more-accurate-types4 branch 3 times, most recently from dace607 to 7c3ed6f Compare September 13, 2020 22:50

Fix exception types

ebbf195

kocsismate force-pushed the more-accurate-types4 branch from 7c3ed6f to ebbf195 Compare September 14, 2020 00:00

kocsismate commented Sep 14, 2020

View reviewed changes

ext/date/php_date.c Outdated Show resolved Hide resolved

nikic reviewed Sep 14, 2020

View reviewed changes

ext/date/php_date.c Outdated Show resolved Hide resolved

nikic and others added 3 commits September 14, 2020 09:50

ext/filter fixes

68302fe

Tweak one more place

6cbe3b5

No behavior difference here, but let's be consistent.

Revert exception changes + add test coverage

1318bbe

kocsismate force-pushed the more-accurate-types4 branch from b682b84 to 1318bbe Compare September 14, 2020 08:49

nikic approved these changes Sep 14, 2020

View reviewed changes

php-pulls closed this in 46c0c82 Sep 14, 2020

kocsismate deleted the more-accurate-types4 branch September 14, 2020 10:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add array|int and object-of-class|int types to stubs #6081

Add array|int and object-of-class|int types to stubs #6081

kocsismate commented Sep 4, 2020 •

edited

Loading

carusogabriel commented Sep 5, 2020

kocsismate commented Sep 7, 2020 •

edited

Loading

nikic left a comment

nikic Sep 13, 2020

kocsismate Sep 13, 2020

nikic Sep 14, 2020

nikic Sep 14, 2020

kocsismate Sep 14, 2020

nikic Sep 14, 2020

kocsismate Sep 14, 2020

nikic Sep 14, 2020

kocsismate Sep 14, 2020

	$perid = new DatePeriod("R4");
	$period = new DatePeriod("R4");

Add array|int and object-of-class|int types to stubs #6081

Add array|int and object-of-class|int types to stubs #6081

Conversation

kocsismate commented Sep 4, 2020 • edited Loading

carusogabriel commented Sep 5, 2020

kocsismate commented Sep 7, 2020 • edited Loading

nikic left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kocsismate commented Sep 4, 2020 •

edited

Loading

kocsismate commented Sep 7, 2020 •

edited

Loading