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
91,179 Commits 547 Branches 1,481 Tags
tmp_liveliness
Commit Graph

709 Commits

Author SHA1 Message Date
Christoph M. Becker
dbadf447b2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed typo in test for bug #66985
 2015-07-07 23:39:18 +02:00
Christoph M. Becker
e68b5252a2 fixed typo in test for bug #66985 2015-07-07 23:35:28 +02:00
Aaron Piotrowski
110e0a5a2c Merge branch 'master' into throwable-interface 
# Conflicts:
#	Zend/zend_language_scanner.c
#	Zend/zend_language_scanner.l
#	ext/simplexml/tests/SimpleXMLElement_xpath.phpt
 2015-06-14 18:53:11 -05:00
Anatol Belski
b148c50f48 Revert fix for bug #55407 
See 8e19705a93 and discussion on
github. The suggestion is to target a proper solution in in 7.1.
 2015-06-12 17:56:02 +02:00
Anatol Belski
d28ab1cba3 fix datetime tests with vc14 
VC14 RC seems to support more format extensions, however some
difrerences do still persist.
 2015-05-24 23:49:42 +02:00
Anatol Belski
9770553437 make the test more reliable 2015-05-24 23:49:40 +02:00
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
440481fb3e Display TypeExceptions like normal exceptions 
We currently don't show the argument at which the error actually
occured in the trace - should probably either add it or don't
display args on incomplete frames altogether, otherwise this'll
probably be confusing.
 2015-05-17 19:54:12 +02: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
Remi Collet
ac3ca0280a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Relax tests failing on i386 with new zic
 2015-05-05 11:23:13 +02:00
Remi Collet
33e2aa452d Relax tests failing on i386 with new zic 2015-05-05 11:22:29 +02:00
Remi Collet
97fcbf041a relax tests with huge year (new zic) 2015-04-28 12:48:47 +02:00
Remi Collet
c1e84a3bde ignore second value for huge timestamp test (new zic) 2015-04-28 12:48:38 +02:00
Remi Collet
194e64982e relax test for date < INT32_MIN (new zic) 2015-04-28 12:48:30 +02:00
Remi Collet
ba41b340c2 relax bigbang content (new zic) 2015-04-28 12:48:23 +02:00
Remi Collet
c39e777722 Make date transitions tests more flexible 
zic in recent glibc (2.20) introduce a new transitionn
so use a range to avoid failure when total number
of transitions is different (243/244)
 2015-04-28 12:48:13 +02:00
Remi Collet
1f0a6241b4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  relax tests with huge year (new zic)
 2015-04-18 10:00:24 +02:00
Remi Collet
1302eb7f72 relax tests with huge year (new zic) 2015-04-18 10:00:15 +02:00
Remi Collet
3bbfb96e1a ignore second value for huge timestamp test (new zic) 2015-04-18 09:37:06 +02:00
Remi Collet
81d01809a2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  relax test for date < INT32_MIN (new zic)
 2015-04-18 09:28:39 +02:00
Remi Collet
3c81e945a3 relax test for date < INT32_MIN (new zic) 2015-04-18 09:28:29 +02:00
Remi Collet
f877bdac72 Merge branch 'PHP-5.6' 
* PHP-5.6:
  relax bigbang content (new zic)
 2015-04-18 09:11:48 +02:00
Remi Collet
984f4b09e0 relax bigbang content (new zic) 2015-04-18 09:11:39 +02:00
Remi Collet
971441cfe5 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Make date transitions tests more flexible
 2015-04-18 07:50:31 +02:00
Remi Collet
cd93b120c3 Make date transitions tests more flexible 
zic in recent glibc (2.20) introduce a new transitionn
so use a range to avoid failure when total number
of transitions is different (243/244)
 2015-04-18 07:47:47 +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
Stanislav Malyshev
4975019dd7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Revert "Merge branch 'PHP-5.5' into PHP-5.6"

Conflicts:
	ext/date/php_date.c
	ext/date/tests/DateTime_verify.phpt
 2015-04-01 12:50:40 -07:00
Stanislav Malyshev
2d9399af35 Revert "Merge branch 'PHP-5.5' into PHP-5.6" 
This reverts commit aa22e80b1a, reversing
changes made to 3e7f47cb03.

Conflicts:
	ext/date/php_date.c
 2015-04-01 12:49:25 -07:00
Derick Rethans
d252c9f832 Merge branch 'PHP-5.6' 
Conflicts:
	ext/date/lib/parse_date.c
	ext/date/php_date.c
 2015-03-31 16:36:51 +01:00
Derick Rethans
2d3868984c Merge branch 'PHP-5.5' into PHP-5.6 2015-03-31 16:35:10 +01:00
Derick Rethans
ffbd380e44 Fixed bug #69336 (Issues with "last day of <monthname>"). 2015-03-31 16:35:03 +01:00
Stanislav Malyshev
cc2fd00942 Merge branch 'pull-request/1145' 
* pull-request/1145:
  Putting whitespace back to the way it was.
  Updating the `DateTime_verify` test to include the new method in the reflected method list
  Whoops! String length....
  Adding a new test for the new method
  Adding a new `createFromImmutable` method to the `DateTime` class to mirror the current `DateTime::createFromMutable()`
 2015-03-22 21:04:41 -07:00
Stanislav Malyshev
aa22e80b1a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Adding a new `createFromImmutable` method to the `DateTime` class to mirror the current `DateTime::createFromMutable()`
 2015-03-22 21:03:46 -07:00
Trevor Suarez
c2e22556ba Adding a new createFromImmutable method to the DateTime class to mirror the current DateTime::createFromMutable() 2015-03-22 20:54:25 -07:00
Anatol Belski
92d106d26d fixed test 2015-03-13 17:33:48 +01:00
Dmitry Stogov
a30d328671 Errors converted to exceptions are not "recoverable" anymore. 2015-03-10 10:31:55 +03:00
Dmitry Stogov
1c94ff0595 Implement engine exceptions 
RFC: https://wiki.php.net/rfc/engine_exceptions_for_php7

Pending changes regarding naming of BaseException and whether it
should be an interface.
 2015-03-09 14:01:32 +01:00
Trevor Suarez
1de1b6f927 Updating the DateTime_verify test to include the 
new method in the reflected method list
 2015-03-05 09:50:32 -05:00
Trevor Suarez
d3863aeaf7 Whoops! String length.... 2015-03-05 02:57:14 -05:00
Trevor Suarez
46f22acdcd Adding a new test for the new method 2015-03-05 02:02:50 -05:00
Bob Weinand
b22caa81ee Remove useless date warning 2015-02-27 23:27:09 +01:00
Anatol Belski
5aec067b34 fix dir separator in tests 2015-02-27 16:48:09 +01:00
Mariano Iglesias
d20da1d92e Renaming test to match Bug #69089 2015-02-20 14:17:11 -03:00
Mariano Iglesias
e6819794eb Adding 'v' formatting to DateTime::format(), and adding constant DateTime::RFC3339_EXTENDED to output datetime using the RFC3339 extended format (aka ISO8601 extended format) 2015-02-20 09:21:14 -03:00
Stanislav Malyshev
625ab10f99 Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) 2015-02-17 07:02:20 +01:00
Stanislav Malyshev
78389b29f9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  Port for for bug #68552
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  - BFN
 2015-02-17 06:57:50 +01:00
Stanislav Malyshev
29a4e710de Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) 2015-02-17 06:53:27 +01:00
Julien Pauli
583af4979b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"
 2015-02-04 17:39:34 +01:00