Skip to content

RFC: Constructor behaviour of internal classes #1178

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.

Sign up for GitHub

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

Closed
wants to merge 11 commits into from
Closed

RFC: Constructor behaviour of internal classes #1178

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b00cd68
Fixed PDORow behaviour and message.
Danack Mar 1, 2015
043a026
Fixed ReflectionFunction, ReflectionMethod and ReflectionParameter.
Danack Mar 1, 2015
a519838
Fixed ReflectionExtension and ReflectionProperty.
Danack Mar 1, 2015
c57bde7
Fixed SplFixedArray and tests.
Danack Mar 1, 2015
99dae96
Converted intl extension to use IntlException in constructors.
Danack Mar 15, 2015
0922eca
Made Phar throw exception on bad constructor.
Danack Mar 15, 2015
78ebf83
Fixed fileinfo behaviour.
Danack Mar 15, 2015
d3267d0
Fixed PDO constructor to not return null.
Danack Mar 15, 2015
9803fcc
Made UConverter throw an exception if the constructor fails.
Danack Mar 15, 2015
6b23264
Reverted change to function name and added note of why it is differen…
Danack Mar 15, 2015
910a324
Fixed indentation. Fixed comment style. Fixed commented out code.
Danack Mar 16, 2015
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
Fixed fileinfo behaviour.
  • Loading branch information
@Danack
Danack committed Mar 15, 2015
commit 78ebf83ad3299bdb2617da60c9be68ce2cf33fb4
12 changes: 11 additions & 1 deletion ext/fileinfo/fileinfo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,18 @@ PHP_FUNCTION(finfo_open)
php_fileinfo *finfo;
FILEINFO_DECLARE_INIT_OBJECT(object)
char resolved_path[MAXPATHLEN];
zend_error_handling zeh;
int rv;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "|lp", &options, &file, &file_len) == FAILURE) {
if (object) {
zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
rv = zend_parse_parameters(ZEND_NUM_ARGS(), "|lp", &options, &file, &file_len);
zend_restore_error_handling(&zeh TSRMLS_CC);
} else {
rv = zend_parse_parameters(ZEND_NUM_ARGS(), "|lp", &options, &file, &file_len);
}

if (rv == FAILURE) {
FILEINFO_DESTROY_OBJECT(object);
RETURN_FALSE;
}
Expand Down