Make recommended fixes from Plugin Check

Author: dshanske

includes/class-location-plugins.php

@@ -36,8 +36,7 @@ public static function array_get( $array, $key, $default = array(), $index = tru
 	}
 
 	/**
-	 *
-	 *
+	 * Adds location properties to webmention returns.
 	 */
 	public static function webmention_handler_mf2_set_properties( $meta, $handler ) {
 		$item = $handler->get_webmention_item();

includes/functions.php

@@ -631,22 +631,22 @@ function sloc_get_attachment_datetime( $attachment, $field = 'created' ) {
 }
 
 function sloc_file_exists( $file ) {
-		require_once ( ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php' );
-		require_once ( ABSPATH . 'wp-admin/includes/class-wp-filesystem-direct.php' );
+		require_once ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php';
+		require_once ABSPATH . 'wp-admin/includes/class-wp-filesystem-direct.php';
 		$wpfile = new WP_Filesystem_Direct( false );
 		return $wpfile->exists( $file );
 }
 
 function sloc_get_contents( $file ) {
-		require_once ( ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php' );
-		require_once ( ABSPATH . 'wp-admin/includes/class-wp-filesystem-direct.php' );
+		require_once ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php';
+		require_once ABSPATH . 'wp-admin/includes/class-wp-filesystem-direct.php';
 		$wpfile = new WP_Filesystem_Direct( false );
 		return $wpfile->get_contents( $file );
 }
 
 function sloc_get_contents_array( $file ) {
-		require_once ( ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php' );
-		require_once ( ABSPATH . 'wp-admin/includes/class-wp-filesystem-direct.php' );
+		require_once ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php';
+		require_once ABSPATH . 'wp-admin/includes/class-wp-filesystem-direct.php';
 		$wpfile = new WP_Filesystem_Direct( false );
 		return $wpfile->get_contents_array( $file );
 }

includes/weather/class-weather-provider-aeris.php

@@ -273,7 +273,7 @@ private function code_map( $id ) {
 			case 'L': // Drizzle.
 				return 301;
 			case 'R': // Rain.
-				500;
+				return 500;
 			case 'RW': // Rain showers.
 				return 521;
 			case 'RS': // Rain/snow mix.

includes/weather/class-weather-provider-meteostat.php

@@ -106,12 +106,6 @@ function ( $a, $b ) {
 			return $return;
 		}
 		return self::get_fallback_conditions( $time );
-
-		$conditions = $this->get_cache();
-		if ( $conditions ) {
-			return $conditions;
-		}
-		return array();
 	}
 
 	/**

includes/weather/class-weather-provider-metoffice.php

@@ -143,7 +143,7 @@ function ( $a, $b ) {
 	}
 
 	/**
-	 * converts code into weather description.
+	 * Converts code into weather description.
 	 *
 	 * @param int $type code.
 	 * @return string description.

includes/weather/class-weather-provider-nwsus.php

@@ -277,15 +277,15 @@ private function phenomenon_code_map( $weather ) {
 
 		switch ( $condition ) {
 			case 'thunderstorms':
-				if ( ! isset( $weather['intensity'] ) ) {
-					return 211;
-				}
-				if ( 'light' === $weather['intensity'] ) {
-					return 210;
-				}
-				if ( 'heavy' === $weather['intensity'] ) {
-					return 212;
+				if ( array_key_exists( 'intensity', $weather ) ) {
+					if ( 'light' === $weather['intensity'] ) {
+						return 210;
+					}
+					if ( 'heavy' === $weather['intensity'] ) {
+						return 212;
+					}
 				}
+				return 211;
 			case 'fog':
 			case 'fog_mist':
 				return 741;
@@ -294,15 +294,15 @@ private function phenomenon_code_map( $weather ) {
 			case 'dust_whirls':
 				return 761;
 			case 'drizzle':
-				if ( ! isset( $weather['intensity'] ) ) {
-					return 301;
-				}
-				if ( 'light' === $weather['intensity'] ) {
-					return 300;
-				}
-				if ( 'heavy' === $weather['intensity'] ) {
-					return 302;
+				if ( array_key_exists( 'intensity', $weather ) ) {
+					if ( 'light' === $weather['intensity'] ) {
+						return 300;
+					}
+					if ( 'heavy' === $weather['intensity'] ) {
+						return 302;
+					}
 				}
+				return 301;
 			case 'smoke':
 				return 711;
 			case 'hail':
@@ -315,29 +315,29 @@ private function phenomenon_code_map( $weather ) {
 			case 'ice_pellets':
 			case 'spray':
 			case 'rain':
-				if ( ! isset( $weather['intensity'] ) ) {
-					return 521;
-				}
-				if ( 'light' === $weather['intensity'] ) {
-					return 520;
-				}
-				if ( 'heavy' === $weather['intensity'] ) {
-					return 522;
+				if ( array_key_exists( 'intensity', $weather ) ) {
+					if ( 'light' === $weather['intensity'] ) {
+						return 520;
+					}
+					if ( 'heavy' === $weather['intensity'] ) {
+						return 522;
+					}
 				}
+				return 521;
 			case 'sand':
 			case 'sand_storm':
 				return 751;
 			case 'snow_grains':
 			case 'snow':
-				if ( ! isset( $weather['intensity'] ) ) {
-					return 601;
-				}
-				if ( 'light' === $weather['intensity'] ) {
-					return 600;
-				}
-				if ( 'heavy' === $weather['intensity'] ) {
-					return 602;
+				if ( array_key_exists( 'intensity', $weather ) ) {
+					if ( 'light' === $weather['intensity'] ) {
+						return 600;
+					}
+					if ( 'heavy' === $weather['intensity'] ) {
+						return 602;
+					}
 				}
+				return 601;
 			case 'squalls':
 				return 771;
 			case 'volcanic_ash':

includes/weather/class-weather-provider-station.php

@@ -243,7 +243,6 @@ function ( $a, $b ) {
 	public function get_station_data() {
 		$return   = array();
 		$stations = get_option( 'sloc_stations' );
-		$endpoint = null;
 		foreach ( $stations as $key => $station ) {
 			if ( trim( $station['id'] === $this->station_id ) ) {
 				$return = $this->fetch_json( $station['url'], array() );