Use properties instead of get methods

westonruter · westonruter · commit 384fa53f9de6 · 2024-09-10T11:31:00.000-07:00
diff --git a/plugins/optimization-detective/class-od-url-metrics-group-collection.php b/plugins/optimization-detective/class-od-url-metrics-group-collection.php
@@ -193,7 +193,7 @@ private function create_groups(): array {
 	 */
 	public function add_url_metric( OD_URL_Metric $new_url_metric ): void {
 		foreach ( $this->groups as $group ) {
-			if ( $group->is_viewport_width_in_range( $new_url_metric->get_viewport_width() ) ) {
+			if ( $group->is_viewport_width_in_range( $new_url_metric->viewport['width'] ) ) {
 				$group->add_url_metric( $new_url_metric );
 				return;
 			}
@@ -416,7 +416,7 @@ public function get_all_element_max_intersection_ratios(): array {
 			 */
 			foreach ( $this->groups as $group ) {
 				foreach ( $group as $url_metric ) {
-					foreach ( $url_metric->get_elements() as $element ) {
+					foreach ( $url_metric->elements as $element ) {
 						$element_max_intersection_ratios[ $element['xpath'] ] = array_key_exists( $element['xpath'], $element_max_intersection_ratios )
 							? max( $element_max_intersection_ratios[ $element['xpath'] ], $element['intersectionRatio'] )
 							: $element['intersectionRatio'];
diff --git a/plugins/optimization-detective/class-od-url-metrics-group.php b/plugins/optimization-detective/class-od-url-metrics-group.php
@@ -181,7 +181,7 @@ public function is_viewport_width_in_range( int $viewport_width ): bool {
 	 * @param OD_URL_Metric $url_metric URL metric.
 	 */
 	public function add_url_metric( OD_URL_Metric $url_metric ): void {
-		if ( ! $this->is_viewport_width_in_range( $url_metric->get_viewport_width() ) ) {
+		if ( ! $this->is_viewport_width_in_range( $url_metric->viewport['width'] ) ) {
 			throw new InvalidArgumentException(
 				esc_html__( 'URL metric is not in the viewport range for group.', 'optimization-detective' )
 			);
@@ -201,7 +201,7 @@ public function add_url_metric( OD_URL_Metric $url_metric ): void {
 			usort(
 				$this->url_metrics,
 				static function ( OD_URL_Metric $a, OD_URL_Metric $b ): int {
-					return $b->get_timestamp() <=> $a->get_timestamp();
+					return $b->timestamp <=> $a->timestamp;
 				}
 			);
 
@@ -283,7 +283,7 @@ public function get_lcp_element(): ?array {
 			$breadcrumb_element = array();
 
 			foreach ( $this->url_metrics as $url_metric ) {
-				foreach ( $url_metric->get_elements() as $element ) {
+				foreach ( $url_metric->elements as $element ) {
 					if ( ! $element['isLCP'] ) {
 						continue;
 					}
diff --git a/plugins/optimization-detective/storage/class-od-url-metrics-post-type.php b/plugins/optimization-detective/storage/class-od-url-metrics-post-type.php
@@ -200,7 +200,7 @@ public static function store_url_metric( string $slug, OD_URL_Metric $new_url_me
 			// multiple URL Metric instances, each of which also contains the URL for which the metric was captured. The URL
 			// appearing in the post title is therefore the most recent URL seen for the URL Metrics which have the same
 			// normalized query vars among them.
-			'post_title' => $new_url_metric->get_url(),
+			'post_title' => $new_url_metric->url,
 		);
 
 		$post = self::get_post( $slug );
@@ -221,7 +221,7 @@ public static function store_url_metric( string $slug, OD_URL_Metric $new_url_me
 		);
 
 		try {
-			$group = $group_collection->get_group_for_viewport_width( $new_url_metric->get_viewport_width() );
+			$group = $group_collection->get_group_for_viewport_width( $new_url_metric->viewport['width'] );
 			$group->add_url_metric( $new_url_metric );
 		} catch ( InvalidArgumentException $e ) {
 			return new WP_Error( 'invalid_url_metric', $e->getMessage() );
