Fix [-Wimplicit-fallthrough] warnings in SPL extension

Author: Girgias

ext/spl/spl_array.c

@@ -300,19 +300,22 @@ static zval *spl_array_get_dimension_ptr(int check_inherited, spl_array_object *
 	   offset_key = Z_STR_P(offset);
 fetch_dim_string:
 		retval = zend_symtable_find(ht, offset_key);
+		/* TODO Combine both branches as only the RW case is different? */
 		if (retval) {
 			if (Z_TYPE_P(retval) == IS_INDIRECT) {
 				retval = Z_INDIRECT_P(retval);
 				if (Z_TYPE_P(retval) == IS_UNDEF) {
 					switch (type) {
 						case BP_VAR_R:
 							zend_error(E_WARNING, "Undefined array key \"%s\"", ZSTR_VAL(offset_key));
+							fallthrough;
 						case BP_VAR_UNSET:
 						case BP_VAR_IS:
 							retval = &EG(uninitialized_zval);
 							break;
 						case BP_VAR_RW:
 							zend_error(E_WARNING,"Undefined array key \"%s\"", ZSTR_VAL(offset_key));
+							fallthrough;
 						case BP_VAR_W: {
 							ZVAL_NULL(retval);
 						}
@@ -323,12 +326,14 @@ static zval *spl_array_get_dimension_ptr(int check_inherited, spl_array_object *
 			switch (type) {
 				case BP_VAR_R:
 					zend_error(E_WARNING, "Undefined array key \"%s\"", ZSTR_VAL(offset_key));
+					fallthrough;
 				case BP_VAR_UNSET:
 				case BP_VAR_IS:
 					retval = &EG(uninitialized_zval);
 					break;
 				case BP_VAR_RW:
 					zend_error(E_WARNING,"Undefined array key \"%s\"", ZSTR_VAL(offset_key));
+					fallthrough;
 				case BP_VAR_W: {
 				    zval value;
 					ZVAL_NULL(&value);
@@ -357,12 +362,14 @@ static zval *spl_array_get_dimension_ptr(int check_inherited, spl_array_object *
 			switch (type) {
 				case BP_VAR_R:
 					zend_error(E_WARNING, "Undefined array key " ZEND_LONG_FMT, index);
+					fallthrough;
 				case BP_VAR_UNSET:
 				case BP_VAR_IS:
 					retval = &EG(uninitialized_zval);
 					break;
 				case BP_VAR_RW:
 					zend_error(E_WARNING, "Undefined array key " ZEND_LONG_FMT, index);
+					fallthrough;
 				case BP_VAR_W: {
 				    zval value;
 					ZVAL_UNDEF(&value);

ext/spl/spl_directory.c

@@ -2340,21 +2340,21 @@ PHP_METHOD(SplFileObject, fgetcsv)
 			} else {
 				escape = (unsigned char) esc[0];
 			}
-			/* no break */
+			fallthrough;
 		case 2:
 			if (e_len != 1) {
 				zend_argument_value_error(2, "must be a single character");
 				RETURN_THROWS();
 			}
 			enclosure = enclo[0];
-			/* no break */
+			fallthrough;
 		case 1:
 			if (d_len != 1) {
 				zend_argument_value_error(1, "must be a single character");
 				RETURN_THROWS();
 			}
 			delimiter = delim[0];
-			/* no break */
+			fallthrough;
 		case 0:
 			break;
 		}
@@ -2390,21 +2390,21 @@ PHP_METHOD(SplFileObject, fputcsv)
 					zend_argument_value_error(4, "must be empty or a single character");
 					RETURN_THROWS();
 			}
-			/* no break */
+			fallthrough;
 		case 3:
 			if (e_len != 1) {
 				zend_argument_value_error(3, "must be a single character");
 				RETURN_THROWS();
 			}
 			enclosure = enclo[0];
-			/* no break */
+			fallthrough;
 		case 2:
 			if (d_len != 1) {
 				zend_argument_value_error(2, "must be a single character");
 				RETURN_THROWS();
 			}
 			delimiter = delim[0];
-			/* no break */
+			fallthrough;
 		case 1:
 		case 0:
 			break;
@@ -2442,21 +2442,21 @@ PHP_METHOD(SplFileObject, setCsvControl)
 					zend_argument_value_error(3, "must be empty or a single character");
 					RETURN_THROWS();
 			}
-			/* no break */
+			fallthrough;
 		case 2:
 			if (e_len != 1) {
 				zend_argument_value_error(2, "must be a single character");
 				RETURN_THROWS();
 			}
 			enclosure = enclo[0];
-			/* no break */
+			fallthrough;
 		case 1:
 			if (d_len != 1) {
 				zend_argument_value_error(1, "must be a single character");
 				RETURN_THROWS();
 			}
 			delimiter = delim[0];
-			/* no break */
+			fallthrough;
 		case 0:
 			break;
 		}

ext/spl/spl_iterators.c

@@ -243,13 +243,15 @@ static void spl_recursive_it_move_forward_ex(spl_recursive_it_object *object, zv
 						zend_clear_exception();
 					}
 				}
-				/* fall through */
+				fallthrough;
 			case RS_START:
 				if (iterator->funcs->valid(iterator) == FAILURE) {
 					break;
 				}
 				object->iterators[object->level].state = RS_TEST;
 				/* break; */
+				/* TODO: Check this is correct */
+				fallthrough;
 			case RS_TEST:
 				ce = object->iterators[object->level].ce;
 				zobject = &object->iterators[object->level].zobject;