Merge remote-tracking branch 'origin/master' into str_size_and_int64

weltling · weltling · commit 0e7bf92129f6 · 2014-06-06T09:06:48.000+02:00
* origin/master: restore correct behavior of DateTime fix test use invalid code Fixed startup segfault in non-debug builds Fixes issue #87 PHP 5.4/5.5 compability in phpdbg_watch.c fix gcov data with some locales (again) Conflicts: ext/date/php_date.c
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
@@ -2718,7 +2718,9 @@ PHP_METHOD(DateTime, __construct)
 
 	zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC);
 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|SO!", &time_str, &time_str_len, &timezone_object, date_ce_timezone)) {
-		php_date_initialize(zend_object_store_get_object(getThis() TSRMLS_CC), time_str, time_str_len, NULL, timezone_object, 1 TSRMLS_CC);
+		if (!php_date_initialize(zend_object_store_get_object(getThis() TSRMLS_CC), time_str, time_str_len, NULL, timezone_object, 1 TSRMLS_CC)) {
+			ZVAL_NULL(getThis());
+		}
 	}
 	zend_restore_error_handling(&error_handling TSRMLS_CC);
 }
diff --git a/ext/date/tests/bug67118.phpt b/ext/date/tests/bug67118.phpt
@@ -23,5 +23,4 @@ class mydt extends datetime
 new mydt("Funktionsansvarig rådgivning och juridik", "UTC");
 ?>
 --EXPECTF--
-Warning: DateTime::format(): The DateTime object has not been correctly initialized by its constructor in %sbug67118.php on line %d
-Bad date
+Fatal error: Call to a member function format() on a non-object in %sbug67118.php on line %d
diff --git a/ext/date/tests/bug67118_2.phpt b/ext/date/tests/bug67118_2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Regression introduce in fix for Bug #67118
+Regression introduce in fix for Bug #67118 - Invalid code
 --INI--
 date.timezone=Europe/Paris
 --FILE--
@@ -24,12 +24,5 @@ Done
 --EXPECTF--
 First try
 Second try
-object(Foo)#1 (3) {
-  ["date"]=>
-  string(%d) "2007-09-12 15:49:%s"
-  ["timezone_type"]=>
-  int(3)
-  ["timezone"]=>
-  string(3) "UTC"
-}
-Done
+NULL
+Done

Original file line number	Diff line number	Diff line change
`@@ -2718,7 +2718,9 @@ PHP_METHOD(DateTime, __construct)`
`2718`	`2718`
`2719`	`2719`	`zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC);`
`2720`	`2720`	`if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "\|SO!", &time_str, &time_str_len, &timezone_object, date_ce_timezone)) {`
`2721`		`- php_date_initialize(zend_object_store_get_object(getThis() TSRMLS_CC), time_str, time_str_len, NULL, timezone_object, 1 TSRMLS_CC);`
	`2721`	`+ if (!php_date_initialize(zend_object_store_get_object(getThis() TSRMLS_CC), time_str, time_str_len, NULL, timezone_object, 1 TSRMLS_CC)) {`
	`2722`	`+ ZVAL_NULL(getThis());`
	`2723`	`+ }`
`2722`	`2724`	`}`
`2723`	`2725`	`zend_restore_error_handling(&error_handling TSRMLS_CC);`
`2724`	`2726`	`}`