chore: Fix array access to be strings. Silly PHP not allowing integers as keys.

Chris Gårdenberg · Chris Gårdenberg · commit 203b6034b8d7 · 2022-01-11T10:24:31.000+01:00
diff --git a/PLUGIN-CHECKSUM b/PLUGIN-CHECKSUM
@@ -1 +1 @@
-c564061f8a752bcd4ecbccc36df64693
+b25931bec226dde6532eef593f8d6b55
diff --git a/content/template/detailTemplate/blocks/event-item.php b/content/template/detailTemplate/blocks/event-item.php
@@ -14,7 +14,7 @@
 
 $event_dates = array();
 if ( ! empty( $ev['EventDates'] ) ) {
-	$event_dates[ $ev['EventId'] ] = $ev['EventDates'];
+	$event_dates[ (string) $ev['EventId'] ] = $ev['EventDates'];
 }
 
 ?>
diff --git a/content/template/detailTemplate/course-info.php b/content/template/detailTemplate/course-info.php
@@ -89,13 +89,13 @@
 
 if ( ! empty( $selected_course['PriceNames'] ) ) {
 	foreach ( $selected_course['PriceNames'] as $pn ) {
-		$prices[ $pn['PriceNameId'] ] = $pn;
+		$prices[ (string) $pn['PriceNameId'] ] = $pn;
 	}
 }
 
 foreach ( $events as $e ) {
 	foreach ( $e['PriceNames'] as $pn ) {
-		$prices[ $pn['PriceNameId'] ] = $pn;
+		$prices[ (string) $pn['PriceNameId'] ] = $pn;
 	}
 }
 
diff --git a/content/template/listTemplate/blocks/course-block.php b/content/template/listTemplate/blocks/course-block.php
@@ -12,7 +12,7 @@
 		$event_cities[ $ev['City'] ] = $ev;
 	}
 	foreach ( $ev['PriceNames'] as $pr ) {
-		$prices[ $pr['Price'] ] = $pr;
+		$prices[ (string) $pr['Price'] ] = $pr;
 	}
 }
 
diff --git a/content/template/listTemplate/blocks/event-block-a.php b/content/template/listTemplate/blocks/event-block-a.php
@@ -32,8 +32,8 @@ class="objectItem <?php echo edu_get_percent_from_values( $spots_left, intval( $
 					}
 					echo '<div class="dayInfo">';
 					echo ( $show_course_days ? sprintf( _n( '%1$d day', '%1$d days', $dayCount, 'eduadmin-booking' ), $dayCount ) .
-					                           ( $show_course_times && $event['StartDate'] != '' && $event['EndDate'] != '' && ! isset( $event_dates[ $event['EventId'] ] ) ? ', ' : '' ) : '' ) .
-					     ( $show_course_times && $event['StartDate'] != '' && $event['EndDate'] != '' && ! isset( $event_dates[ $event['EventId'] ] ) ? edu_get_timezoned_date( "H:i", $event['StartDate'] ) .
+					                           ( $show_course_times && $event['StartDate'] != '' && $event['EndDate'] != '' && ! isset( $event_dates[ (string) $event['EventId'] ] ) ? ', ' : '' ) : '' ) .
+					     ( $show_course_times && $event['StartDate'] != '' && $event['EndDate'] != '' && ! isset( $event_dates[ (string) $event['EventId'] ] ) ? edu_get_timezoned_date( "H:i", $event['StartDate'] ) .
 					                                                                                                                                    ' - ' .
 					                                                                                                                                    edu_get_timezoned_date( "H:i", $event['EndDate'] ) : '' );
 					echo "</div>\n";
diff --git a/content/template/listTemplate/blocks/event-block-b.php b/content/template/listTemplate/blocks/event-block-b.php
@@ -30,8 +30,8 @@ class="objectBlock brick <?php echo edu_get_percent_from_values( $spots_left, $e
 			}
 			echo '<div class="dayInfo">';
 			echo ( $show_course_days ? sprintf( _n( '%1$d day', '%1$d days', $dayCount, 'eduadmin-booking' ), $dayCount ) .
-			                           ( $show_course_times && $event['StartDate'] != '' && $event['EndDate'] != '' && ! isset( $event_dates[ $event['EventId'] ] ) ? ', ' : '' ) : '' ) .
-			     ( $show_course_times && $event['StartDate'] != '' && $event['EndDate'] != '' && ! isset( $event_dates[ $event['EventId'] ] ) ? edu_get_timezoned_date( "H:i", $event['StartDate'] ) .
+			                           ( $show_course_times && $event['StartDate'] != '' && $event['EndDate'] != '' && ! isset( $event_dates[ (string) $event['EventId'] ] ) ? ', ' : '' ) : '' ) .
+			     ( $show_course_times && $event['StartDate'] != '' && $event['EndDate'] != '' && ! isset( $event_dates[ (string) $event['EventId'] ] ) ? edu_get_timezoned_date( "H:i", $event['StartDate'] ) .
 			                                                                                                                                    ' - ' .
 			                                                                                                                                    edu_get_timezoned_date( "H:i", $event['EndDate'] ) : '' );
 			echo "</div>\n";
diff --git a/content/template/listTemplate/list-options.php b/content/template/listTemplate/list-options.php
@@ -27,8 +27,8 @@
 $distinct_subjects = array();
 if ( isset( $subjects['value'] ) ) {
 	foreach ( $subjects['value'] as $subj ) {
-		if ( ! key_exists( $subj['SubjectId'], $distinct_subjects ) ) {
-			$distinct_subjects[ $subj['SubjectId'] ] = $subj['SubjectName'];
+		if ( ! key_exists( (string) $subj['SubjectId'], $distinct_subjects ) ) {
+			$distinct_subjects[ (string) $subj['SubjectId'] ] = $subj['SubjectName'];
 		}
 	}
 }
diff --git a/content/template/listTemplate/template_A_listEvents.php b/content/template/listTemplate/template_A_listEvents.php
@@ -19,7 +19,7 @@
 
 	$event_dates = array();
 	if ( ! empty( $event['EventDates'] ) ) {
-		$event_dates[ $event['EventId'] ] = $event['EventDates'];
+		$event_dates[ (string) $event['EventId'] ] = $event['EventDates'];
 	}
 
 	include 'blocks/event-block-a.php';
diff --git a/content/template/listTemplate/template_B_listEvents.php b/content/template/listTemplate/template_B_listEvents.php
@@ -19,7 +19,7 @@
 
 	$event_dates = array();
 	if ( ! empty( $event['EventDates'] ) ) {
-		$event_dates[ $event['EventId'] ] = $event['EventDates'];
+		$event_dates[ (string) $event['EventId'] ] = $event['EventDates'];
 	}
 	include 'blocks/event-block-b.php';
 	$current_events++;
diff --git a/content/template/programme/template/detail-list.php b/content/template/programme/template/detail-list.php
@@ -78,7 +78,7 @@
 		$priceNames = array();
 
 		foreach ( $programme_start['PriceNames'] as $pn ) {
-			$priceNames[ $pn['Price'] ] = $pn;
+			$priceNames[ (string) $pn['Price'] ] = $pn;
 		}
 
 		$min_price = min( array_keys( $priceNames ) );
diff --git a/includes/booking-settings.php b/includes/booking-settings.php
@@ -45,19 +45,19 @@ class="non-eduform-options"<?php echo( ! EDU()->is_checked( 'eduadmin-useBooking
 
 						$level_stack = array();
 						foreach ( $cg['value'] as $g ) {
-							$level_stack[ $g['ParentCustomerGroupId'] ][] = $g;
+							$level_stack[ (string)$g['ParentCustomerGroupId'] ][] = $g;
 						}
 
 						$depth = 0;
 
 						function edu_write_options( $g, $array, $depth, $selected_option ) {
-							echo '<option value="' . esc_attr( $g['CustomerGroupId'] ) . '"' . ( intval( $selected_option ) === intval( $g['CustomerGroupId'] ) ? ' selected="selected"' : '' ) . '>' .
+							echo '<option value="' . esc_attr( $g['CustomerGroupId'] ) . '"' . ( $selected_option === (string)$g['CustomerGroupId'] ? ' selected="selected"' : '' ) . '>' .
 							     str_repeat( '&nbsp;', $depth * 4 ) .
 							     esc_html( wp_strip_all_tags( $g['CustomerGroupName'] ) ) .
 							     "</option>\n";
-							if ( array_key_exists( $g['CustomerGroupId'], $array ) ) {
+							if ( array_key_exists( (string)$g['CustomerGroupId'], $array ) ) {
 								$depth++;
-								foreach ( $array[ $g['CustomerGroupId'] ] as $ng ) {
+								foreach ( $array[ (string)$g['CustomerGroupId'] ] as $ng ) {
 									edu_write_options( $ng, $array, $depth, $selected_option );
 								}
 								$depth--;
diff --git a/includes/edu-ajax-functions.php b/includes/edu-ajax-functions.php
@@ -83,12 +83,12 @@ function edu_listview_courselist() {
 
 	$return_value = array();
 	foreach ( $courses as $event ) {
-		if ( ! isset( $return_value[ $event['CourseTemplateId'] ] ) && count( $event['Events'] ) > 0 ) {
+		if ( ! isset( $return_value[ (string)$event['CourseTemplateId'] ] ) && count( $event['Events'] ) > 0 ) {
 			/* translators: 1: Next course/event date */
 			if ( $event['OnDemand'] ) {
-				$return_value[ $event['CourseTemplateId'] ] = _x( 'On-demand', 'frontend', 'eduadmin-booking' );
+				$return_value[ (string)$event['CourseTemplateId'] ] = _x( 'On-demand', 'frontend', 'eduadmin-booking' );
 			} else {
-				$return_value[ $event['CourseTemplateId'] ] = sprintf( _x( 'Next event %1$s', 'frontend', 'eduadmin-booking' ), edu_get_timezoned_date( 'Y-m-d', $event['Events'][0]['StartDate'] ) ) . ' ' . $event['Events'][0]['City'];
+				$return_value[ (string)$event['CourseTemplateId'] ] = sprintf( _x( 'Next event %1$s', 'frontend', 'eduadmin-booking' ), edu_get_timezoned_date( 'Y-m-d', $event['Events'][0]['StartDate'] ) ) . ' ' . $event['Events'][0]['City'];
 			}
 		}
 	}
@@ -420,7 +420,7 @@ function edu_api_listview_eventlist_template_A( $data, $request ) {
 
 		$event_dates = array();
 		if ( ! empty( $event['EventDates'] ) ) {
-			$event_dates[ $event['EventId'] ] = $event['EventDates'];
+			$event_dates[ (string)$event['EventId'] ] = $event['EventDates'];
 		}
 
 		include EDUADMIN_PLUGIN_PATH . '/content/template/listTemplate/blocks/event-block-a.php';
@@ -496,7 +496,7 @@ function edu_api_listview_eventlist_template_B( $data, $request ) {
 
 		$event_dates = array();
 		if ( ! empty( $event['EventDates'] ) ) {
-			$event_dates[ $event['EventId'] ] = $event['EventDates'];
+			$event_dates[ (string)$event['EventId'] ] = $event['EventDates'];
 		}
 
 		include EDUADMIN_PLUGIN_PATH . '/content/template/listTemplate/blocks/event-block-b.php';
@@ -592,12 +592,12 @@ function edu_api_eventlist() {
 	$prices = array();
 
 	foreach ( $selected_course['PriceNames'] as $pn ) {
-		$prices[ $pn['PriceNameId'] ] = $pn;
+		$prices[ (string)$pn['PriceNameId'] ] = $pn;
 	}
 
 	foreach ( $events as $e ) {
 		foreach ( $e['PriceNames'] as $pn ) {
-			$prices[ $pn['PriceNameId'] ] = $pn;
+			$prices[ (string)$pn['PriceNameId'] ] = $pn;
 		}
 	}
 
diff --git a/includes/edu-shortcodes.php b/includes/edu-shortcodes.php
@@ -440,7 +440,7 @@ function eduadmin_get_detailinfo( $attributes ) {
 				$prices = array();
 
 				foreach ( $selected_course['PriceNames'] as $pn ) {
-					$prices[ $pn['PriceNameId'] ] = $pn;
+					$prices[ (string)$pn['PriceNameId'] ] = $pn;
 				}
 
 				if ( 1 === count( $prices ) ) {
@@ -458,7 +458,7 @@ function eduadmin_get_detailinfo( $attributes ) {
 
 				foreach ( $events as $e ) {
 					foreach ( $e['PriceNames'] as $pn ) {
-						$prices[ $pn['PriceNameId'] ] = $pn;
+						$prices[ (string)$pn['PriceNameId'] ] = $pn;
 					}
 				}
 
diff --git a/includes/edu-text-functions.php b/includes/edu-text-functions.php
@@ -1122,11 +1122,11 @@ function edu_event_item_date( $ev, $event_dates ) {
 		if ( $ev['OnDemand'] ) {
 			echo '<span class="eduadmin-dateText">' . esc_html_x( 'On-demand', 'frontend', 'eduadmin-booking' ) . '</span>';
 		} else {
-			echo isset( $event_dates[ $ev['EventId'] ] ) ?
-				get_logical_date_groups( $event_dates[ $ev['EventId'] ], $use_short, null, $show_names, $overridden, $always_show_schedule, $never_group ) :
+			echo isset( $event_dates[ (string)$ev['EventId'] ] ) ?
+				get_logical_date_groups( $event_dates[ (string)$ev['EventId'] ], $use_short, null, $show_names, $overridden, $always_show_schedule, $never_group ) :
 				wp_kses_post( get_old_start_end_display_date( $ev['StartDate'], $ev['EndDate'], $use_short, $show_names ) );
 			if ( $show_time ) {
-				echo ! isset( $event_dates[ $ev['EventId'] ] ) ?
+				echo ! isset( $event_dates[ (string)$ev['EventId'] ] ) ?
 					'<span class="eventTime">, ' . esc_html( edu_get_timezoned_date( 'H:i', $ev['StartDate'] ) ) . ' - ' . esc_html( edu_get_timezoned_date( 'H:i', $ev['EndDate'] ) ) . '</span>' :
 					'';
 			}
@@ -1197,7 +1197,7 @@ function my_str_split( $string ) {
 		$s_array = array();
 		$slen    = strlen( $string );
 		for ( $i = 0; $i < $slen; $i++ ) {
-			$s_array[ $i ] = $string[ $i ];
+			$s_array[ (string)$i ] = $string[ $i ];
 		}
 
 		return $s_array;
@@ -1694,9 +1694,7 @@ function no_diacritics( $string ) {
 		$from = array_merge( $from, $cyrylic_from );
 		$to   = array_merge( $to, $cyrylic_to );
 
-		$newstring = str_replace( $from, $to, $string );
-
-		return $newstring;
+		return str_replace( $from, $to, $string );
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-c564061f8a752bcd4ecbccc36df64693`
	`1`	`+b25931bec226dde6532eef593f8d6b55`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`$event_dates = array();`
`16`	`16`	`if ( ! empty( $ev['EventDates'] ) ) {`
`17`		`- $event_dates[ $ev['EventId'] ] = $ev['EventDates'];`
	`17`	`+ $event_dates[ (string) $ev['EventId'] ] = $ev['EventDates'];`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`?>`
Original file line number	Diff line number	Diff line change
`@@ -89,13 +89,13 @@`
`89`	`89`
`90`	`90`	`if ( ! empty( $selected_course['PriceNames'] ) ) {`
`91`	`91`	`foreach ( $selected_course['PriceNames'] as $pn ) {`
`92`		`- $prices[ $pn['PriceNameId'] ] = $pn;`
	`92`	`+ $prices[ (string) $pn['PriceNameId'] ] = $pn;`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`foreach ( $events as $e ) {`
`97`	`97`	`foreach ( $e['PriceNames'] as $pn ) {`
`98`		`- $prices[ $pn['PriceNameId'] ] = $pn;`
	`98`	`+ $prices[ (string) $pn['PriceNameId'] ] = $pn;`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`$event_cities[ $ev['City'] ] = $ev;`
`13`	`13`	`}`
`14`	`14`	`foreach ( $ev['PriceNames'] as $pr ) {`
`15`		`- $prices[ $pr['Price'] ] = $pr;`
	`15`	`+ $prices[ (string) $pr['Price'] ] = $pr;`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@`
`27`	`27`	`$distinct_subjects = array();`
`28`	`28`	`if ( isset( $subjects['value'] ) ) {`
`29`	`29`	`foreach ( $subjects['value'] as $subj ) {`
`30`		`- if ( ! key_exists( $subj['SubjectId'], $distinct_subjects ) ) {`
`31`		`- $distinct_subjects[ $subj['SubjectId'] ] = $subj['SubjectName'];`
	`30`	`+ if ( ! key_exists( (string) $subj['SubjectId'], $distinct_subjects ) ) {`
	`31`	`+ $distinct_subjects[ (string) $subj['SubjectId'] ] = $subj['SubjectName'];`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`
`20`	`20`	`$event_dates = array();`
`21`	`21`	`if ( ! empty( $event['EventDates'] ) ) {`
`22`		`- $event_dates[ $event['EventId'] ] = $event['EventDates'];`
	`22`	`+ $event_dates[ (string) $event['EventId'] ] = $event['EventDates'];`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`include 'blocks/event-block-a.php';`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@`
`78`	`78`	`$priceNames = array();`
`79`	`79`
`80`	`80`	`foreach ( $programme_start['PriceNames'] as $pn ) {`
`81`		`- $priceNames[ $pn['Price'] ] = $pn;`
	`81`	`+ $priceNames[ (string) $pn['Price'] ] = $pn;`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`$min_price = min( array_keys( $priceNames ) );`