array_column: Cleaning up, as recommended in pull request #56 comments

diff --git a/ext/standard/array.c b/ext/standard/array.c
index c5d0fa774751a3f2a5b2ae4d9a8e3120cf694d6d..b5d8275de7f284a8cb6d514c0e1a9c0c0aef45c9 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2578,19 +2578,11 @@ PHP_FUNCTION(array_column)
                return;
        }
 
-       arr_hash = Z_ARRVAL_P(zarray);
-       array_init(return_value);
-
        switch (Z_TYPE_P(zoffset)) {
                case IS_NULL:
                        index = 0;
                        break;
-               case IS_DOUBLE:
-                       index = (long)Z_DVAL_P(zoffset);
-                       break;
-               case IS_BOOL:
                case IS_LONG:
-               case IS_RESOURCE:
                        index = Z_LVAL_P(zoffset);
                        break;
                case IS_STRING:
@@ -2599,9 +2591,12 @@ PHP_FUNCTION(array_column)
                        break;
                default:
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "The key should be either a string or an integer");
-                       return;
+                       RETURN_FALSE;
        }
 
+       arr_hash = Z_ARRVAL_P(zarray);
+       array_init(return_value);
+
        for (zend_hash_internal_pointer_reset_ex(arr_hash, &pointer);
                        zend_hash_get_current_data_ex(arr_hash, (void**)&data, &pointer) == SUCCESS;
                        zend_hash_move_forward_ex(arr_hash, &pointer)) {