Ensure no error in CustomerInfo when country param is null

coreymckrill · coreymckrill · commit 325126344f36 · 2024-07-12T17:37:45.000-07:00
In newer version of PHP, if a param has a type hint of `string` but
receives `null` instead, it will throw an error. This ensures that a
null value is also acceptable in `get_valid_country_code`.
diff --git a/includes/Generator/CustomerInfo.php b/includes/Generator/CustomerInfo.php
@@ -11,11 +11,11 @@ class CustomerInfo {
 	/**
 	 * Get a country code for a country that the store is set to sell to, or validate a given country code.
 	 *
-	 * @param string $country_code ISO 3166-1 alpha-2 country code. E.g. US, ES, CN, RU etc.
+	 * @param string|null $country_code ISO 3166-1 alpha-2 country code. E.g. US, ES, CN, RU etc.
 	 *
 	 * @return string|\WP_Error
 	 */
-	public static function get_valid_country_code( string $country_code = '' ) {
+	public static function get_valid_country_code( ?string $country_code = '' ) {
 		$country_code = strtoupper( $country_code );
 
 		if ( $country_code && ! WC()->countries->country_exists( $country_code ) ) {

Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,11 @@ class CustomerInfo {`
`11`	`11`	`/**`
`12`	`12`	`* Get a country code for a country that the store is set to sell to, or validate a given country code.`
`13`	`13`	`*`
`14`		`- * @param string $country_code ISO 3166-1 alpha-2 country code. E.g. US, ES, CN, RU etc.`
	`14`	`+ * @param string\|null $country_code ISO 3166-1 alpha-2 country code. E.g. US, ES, CN, RU etc.`
`15`	`15`	`*`
`16`	`16`	`* @return string\|\WP_Error`
`17`	`17`	`*/`
`18`		`- public static function get_valid_country_code( string $country_code = '' ) {`
	`18`	`+ public static function get_valid_country_code( ?string $country_code = '' ) {`
`19`	`19`	`$country_code = strtoupper( $country_code );`
`20`	`20`
`21`	`21`	`if ( $country_code && ! WC()->countries->country_exists( $country_code ) ) {`