Commit graph

404 commits

Author SHA1 Message Date
Aaron Piotrowski
e97d5fab35 Update exception names in tests after formatting changes. 2015-05-17 17:31:43 -05:00
Aaron Piotrowski
fb7206e452 Merge branch 'master' into throwable-interface 2015-05-17 16:15:35 -05:00
Nikita Popov
3ae995f03c Tweak uncaught exception message display
This implements a reduced variant of #1226 with just the following
change:

-Fatal error: Uncaught exception 'EngineException' with message 'Call to private method foo::bar() from context ''' in %s:%d
+Fatal error: Uncaught EngineException: Call to private method foo::bar() from context '' in %s:%d

The '' wrapper around messages is very weird if the exception
message itself contains ''. Futhermore having the message wrapped
in '' doesn't work for the "and defined" suffix of
TypeExceptions.
2015-05-17 18:47:06 +02:00
Aaron Piotrowski
64b167d201 Updated tests to reflect exception class changes. 2015-05-16 16:49:14 -05:00
Nikita Popov
c9f27ee422 Display EngineExceptions like ordinary exceptions
TypeException stays as-is for now because it uses messages that are
incompatible with the way exception messages are displayed.

closure_038.phpt and a few others now show that we're generating
too many exceptions for compound operations on undefined properties
-- this needs to be fixed in a followup.
2015-05-15 23:40:32 +02:00
Nikita Popov
122d759618 Always throw TypeException on throwing zpp failures
Introduces a ZEND_PARSE_PARAMS_THROW flag for zpp, which forces to
report FAILURE errors using a TypeException instead of a Warning,
like it would happen in strict mode.

Adds a zend_parse_parameters_throw() convenience function, which
invokes zpp with this flag.

Converts all cases I could identify, where we currently have
throwing zpp usage in constructors and replaces them with this API.
Error handling is still replaced to EH_THROW in some cases to handle
other, domain-specific errors in constructors.
2015-04-06 11:27:34 +02:00
Nikita Popov
30d59aed1c Try fixing PDO MySQL pconnect test
Use less aggressive conversion to exceptions, in particular
do not convert warnings that happen during check_liveness. If the
server has gone away this will just reconnect and we still end up
with a valid connection, so it shouldn't throw.

Also drop some unnecessary checks for malloc returning NULL.
2015-04-04 16:00:17 +02:00
Ferenc Kovacs
956fa034e3 Merge branch 'PHP-5.6'
* PHP-5.6:
  sigh, can't even copypaste without screwing up
2015-04-02 00:07:20 +02:00
Ferenc Kovacs
9806a37a79 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  sigh, can't even copypaste without screwing up
2015-04-02 00:07:13 +02:00
Ferenc Kovacs
9991b8ecee sigh, can't even copypaste without screwing up 2015-04-02 00:07:00 +02:00
Ferenc Kovacs
6923f081b7 Merge branch 'PHP-5.6'
* PHP-5.6:
  oop, put both the error number and message for both db object to the error message
2015-04-01 23:06:32 +02:00
Ferenc Kovacs
e70e2d8310 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  oop, put both the error number and message for both db object to the error message
2015-04-01 23:06:22 +02:00
Ferenc Kovacs
7c1a1189be oop, put both the error number and message for both db object to the error message 2015-04-01 23:06:04 +02:00
Ferenc Kovacs
0328a60eec Merge branch 'PHP-5.6'
* PHP-5.6:
  test fixes
2015-04-01 22:08:29 +02:00
Ferenc Kovacs
faab430141 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  test fixes
2015-04-01 22:08:11 +02:00
Ferenc Kovacs
0a41af216e test fixes 2015-04-01 22:07:52 +02:00
Dmitry Stogov
1018f462d8 Patch improvement:
Removed the corresponding core code.
Fixed ext/com_dotnet and ext/date.
Refactored ext/intl changes.
Improved ext/fileinfo and ext/pdo changes.
Fixed tests.
2015-03-30 18:53:38 +03:00
Dmitry Stogov
a30d328671 Errors converted to exceptions are not "recoverable" anymore. 2015-03-10 10:31:55 +03:00
Matteo Beccati
a51de2168d Merge branch 'PHP-5.6'
* PHP-5.6:
  Update test after fixing bug #68371
2015-01-05 12:12:02 +01:00
Matteo Beccati
38f1b569c2 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Update test after fixing bug #68371
2015-01-05 12:11:46 +01:00
Matteo Beccati
ea1c0c5627 Update test after fixing bug #68371 2015-01-05 12:11:16 +01:00
Matteo Beccati
7d0887a229 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
2015-01-05 10:48:40 +01:00
Matteo Beccati
488d3dac2e Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
2015-01-05 10:48:18 +01:00
Matteo Beccati
7d2f8525d8 Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names 2015-01-05 09:25:48 +01:00
Andrea Faulds
e5eb9530ab Use "float" and "integer" in typehint and zpp errors 2014-12-21 13:23:02 +00:00
Julien Pauli
5a528076d2 Merge branch 'PHP-5.6'
* PHP-5.6:
  Updated NEWS
  Updated NEWS
  Start adding new attribute to control multi statements
2014-12-05 17:06:33 +01:00
Julien Pauli
5104c2bbc3 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Updated NEWS
  Start adding new attribute to control multi statements
2014-12-05 17:05:37 +01:00
pwolanin
4c0bd5e77a Start adding new attribute to control multi statements 2014-12-05 17:03:31 +01:00
Veres Lajos
06fdf359e3 typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-23 14:52:47 -08:00
Veres Lajos
4dc994571d typo fixes - https://github.com/vlajos/misspell_fixer
Conflicts:
	ext/ftp/ftp.h
	ext/pcre/pcrelib/pcre_printint.c
	ext/pcre/pcrelib/sljit/sljitLir.c
	ext/pcre/pcrelib/sljit/sljitLir.h
	ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
	ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
	ext/pgsql/pgsql.c
	ext/phar/func_interceptors.c
	ext/soap/soap.c
	ext/standard/image.c
2014-11-23 14:33:43 -08:00
Matteo Beccati
3e4b91ec7f Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names 2014-11-10 08:16:35 +01:00
Timm Friebe
e83580c1f0 Merge branch 'master' into catchable-fatals/methods-on-non-objects 2014-09-25 19:45:05 +02:00
Xinchen Hui
39c3207896 Revert previous commit by mistake 2014-09-04 11:59:58 +08:00
Xinchen Hui
e90ec235dc Use PHP_GINIT to suppress incompatible pointer type 2014-09-04 11:56:13 +08:00
Timm Friebe
c3d214aa08 MFH 2014-08-16 17:38:20 +02:00
Timm Friebe
9b6062071e Adjust expected fatal error message
Now also includes "on [TYPE]" after merge from master
2014-07-06 17:07:41 +02:00
Timm Friebe
a1554ca634 Merge in changes from master
Now also includes "on [TYPE]" in "Call to a member function" error
2014-07-06 17:07:01 +02:00
Dmitry Stogov
629c9d3eda Merge branch 'master' into phpng
* master:
  Fixed MarinaDB support
2014-06-20 14:02:15 +04:00
Dmitry Stogov
f08a5bfadc Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed MarinaDB support
2014-06-20 13:58:26 +04:00
Dmitry Stogov
f0639611cf Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed MarinaDB support
2014-06-20 13:57:38 +04:00
Dmitry Stogov
680ddabac1 Fixed MarinaDB support 2014-06-20 13:56:32 +04:00
Dmitry Stogov
dd1c68e67f Merge branch 'master' into phpng
* master: (77 commits)
  NEWS entry for Fix potential segfault in dns_get_record()
  NEWS entry for "Fix potential segfault in dns_get_record()"
  NEWS entry for Fix potential segfault in dns_get_record(
  Fix potential segfault in dns_get_record()
  Revert "Add optional second arg to unserialize()"
  5.5.15 now
  update NEWS
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next
  Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.
  Fix broken test.
  Add a mime type map generation script and update the header.
  Move the mime type map out of php_cli_server.c for easier generation.
  Replace the CLI server's linear search for extensions with a hash table.
  fix test
  Remove unused included file
  NEWS
  NEWS
  NEWS
  Fixed Bug #67413 	fileinfo: cdf_read_property_info insufficient boundary chec
  ...

Conflicts:
	Zend/zend_closures.c
	Zend/zend_execute.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/spl/spl_array.c
	ext/standard/basic_functions.c
	ext/standard/dns.c
	ext/standard/var.c
2014-06-12 05:07:33 +04:00
Boro Sitnikovski
cfccdc6362 Bug 64744
Show the type of the non-object for more descriptive errors
2014-06-08 19:14:58 -07:00
Xinchen Hui
3a1f79d51d Fixed bug #47407 2014-05-27 11:48:25 +08:00
Dmitry Stogov
b38bb265d4 Fixed test. The warning actually indicate a problem in master that we didn't repeat in phpng. 2014-05-19 22:20:02 +04:00
Dmitry Stogov
c25f09e6ab Reverted wrong commit
Xinchen, stop commit changed configs :)
You may use environment variables to ovverride default settings
2014-05-13 21:29:57 +04:00
Xinchen Hui
618de55485 restore unexpected commit 2014-05-13 12:25:03 +08:00
Xinchen Hui
be79628b87 Fixed REFERENCE handling 2014-05-08 16:11:50 +08:00
Xinchen Hui
e3a0809655 Rerevert previous commit to phpt by accident 2014-05-07 17:01:59 +08:00
Xinchen Hui
ed5b6af8af Refactored filter 2014-05-07 16:52:58 +08:00