php.net |  support |  documentation |  report a bug |  advanced search |  search howto |  statistics |  random bug |  login
Return to Bug #60362
Patch fix_to_prevent_warning_on_isset_empty_for_55_and_a_half.patch revision 2011-12-21 14:34 UTC by alan_k@php.net
Patch isset_changed_warning_only_on_access.patch revision 2011-12-18 05:08 UTC by alan_k@php.net
Patch string_offset_trigger_notice.patch revision 2011-12-05 05:17 UTC by laruence@php.net
revision 2011-12-04 17:26 UTC by laruence@php.net
Patch fix_disabling_bad_string_offsets revision 2011-12-04 16:43 UTC by laruence@php.net
revision 2011-12-04 12:44 UTC by alan at akbkhome dot com
Patch first_effort_to_fix_this revision 2011-12-03 15:51 UTC by alan at akbkhome dot com
Patch bug60362.sub-sub-keys.phpt revision 2011-11-23 01:40 UTC by danielc at analysisandsolutions dot com

Patch fix_to_prevent_warning_on_isset_empty_for_55_and_a_half.patch for Arrays related Bug #60362

Patch version 2011-12-21 14:34 UTC

Return to Bug #60362 | Download this patch
Patch Revisions:

Developer: alan_k@php.net

Index: Zend/tests/empty_str_offset.phpt
===================================================================
--- Zend/tests/empty_str_offset.phpt	(revision 321291)
+++ Zend/tests/empty_str_offset.phpt	(working copy)
@@ -64,9 +64,7 @@
 bool(true)
 bool(true)
 bool(true)
-
-Notice: A non well formed numeric value encountered in %s line %d
-bool(false)
+bool(true)
 - bool ---
 bool(false)
 bool(false)
Index: Zend/tests/isset_str_offset.phpt
===================================================================
--- Zend/tests/isset_str_offset.phpt	(revision 321291)
+++ Zend/tests/isset_str_offset.phpt	(working copy)
@@ -64,9 +64,7 @@
 bool(true)
 bool(false)
 bool(false)
-
-Notice: A non well formed numeric value encountered in %s line %d
-bool(true)
+bool(false)
 - bool ---
 bool(true)
 bool(true)
Index: Zend/zend_vm_def.h
===================================================================
--- Zend/zend_vm_def.h	(revision 321291)
+++ Zend/zend_vm_def.h	(working copy)
@@ -4509,7 +4509,7 @@
 		if (Z_TYPE_P(offset) != IS_LONG) {
 			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
 				|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
-						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
+						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 			ZVAL_COPY_VALUE(&tmp, offset);
 			zval_copy_ctor(&tmp);
 			convert_to_long(&tmp);
Index: Zend/zend_vm_execute.h
===================================================================
--- Zend/zend_vm_execute.h	(revision 321291)
+++ Zend/zend_vm_execute.h	(working copy)
@@ -14037,7 +14037,7 @@
 		if (Z_TYPE_P(offset) != IS_LONG) {
 			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
 				|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
-						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
+						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 			ZVAL_COPY_VALUE(&tmp, offset);
 			zval_copy_ctor(&tmp);
 			convert_to_long(&tmp);
@@ -15950,7 +15950,7 @@
 		if (Z_TYPE_P(offset) != IS_LONG) {
 			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
 				|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
-						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
+						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 			ZVAL_COPY_VALUE(&tmp, offset);
 			zval_copy_ctor(&tmp);
 			convert_to_long(&tmp);
@@ -18221,7 +18221,7 @@
 		if (Z_TYPE_P(offset) != IS_LONG) {
 			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
 				|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
-						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
+						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 			ZVAL_COPY_VALUE(&tmp, offset);
 			zval_copy_ctor(&tmp);
 			convert_to_long(&tmp);
@@ -21142,7 +21142,7 @@
 		if (Z_TYPE_P(offset) != IS_LONG) {
 			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
 				|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
-						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
+						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 			ZVAL_COPY_VALUE(&tmp, offset);
 			zval_copy_ctor(&tmp);
 			convert_to_long(&tmp);
@@ -22476,7 +22476,7 @@
 		if (Z_TYPE_P(offset) != IS_LONG) {
 			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
 				|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
-						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
+						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 			ZVAL_COPY_VALUE(&tmp, offset);
 			zval_copy_ctor(&tmp);
 			convert_to_long(&tmp);
@@ -23633,7 +23633,7 @@
 		if (Z_TYPE_P(offset) != IS_LONG) {
 			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
 				|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
-						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
+						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 			ZVAL_COPY_VALUE(&tmp, offset);
 			zval_copy_ctor(&tmp);
 			convert_to_long(&tmp);
@@ -24790,7 +24790,7 @@
 		if (Z_TYPE_P(offset) != IS_LONG) {
 			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
 				|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
-						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
+						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 			ZVAL_COPY_VALUE(&tmp, offset);
 			zval_copy_ctor(&tmp);
 			convert_to_long(&tmp);
@@ -26213,7 +26213,7 @@
 		if (Z_TYPE_P(offset) != IS_LONG) {
 			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
 				|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
-						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
+						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 			ZVAL_COPY_VALUE(&tmp, offset);
 			zval_copy_ctor(&tmp);
 			convert_to_long(&tmp);
@@ -29528,7 +29528,7 @@
 		if (Z_TYPE_P(offset) != IS_LONG) {
 			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
 				|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
-						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
+						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 			ZVAL_COPY_VALUE(&tmp, offset);
 			zval_copy_ctor(&tmp);
 			convert_to_long(&tmp);
@@ -31315,7 +31315,7 @@
 		if (Z_TYPE_P(offset) != IS_LONG) {
 			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
 				|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
-						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
+						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 			ZVAL_COPY_VALUE(&tmp, offset);
 			zval_copy_ctor(&tmp);
 			convert_to_long(&tmp);
@@ -33459,7 +33459,7 @@
 		if (Z_TYPE_P(offset) != IS_LONG) {
 			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
 				|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
-						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
+						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 			ZVAL_COPY_VALUE(&tmp, offset);
 			zval_copy_ctor(&tmp);
 			convert_to_long(&tmp);
@@ -36117,7 +36117,7 @@
 		if (Z_TYPE_P(offset) != IS_LONG) {
 			if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
 				|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
-						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, -1))) {
+						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 			ZVAL_COPY_VALUE(&tmp, offset);
 			zval_copy_ctor(&tmp);
 			convert_to_long(&tmp);
 
PHP Copyright © 2001-2014 The PHP Group
All rights reserved.
Last updated: Fri Apr 18 08:02:55 2014 UTC