Rename recentEvents setting to detectedEvents.

google · Aug 28, 2024 · 614d0fe · 614d0fe
1 parent 449f70c
commit 614d0fe
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/includes/Modules/Analytics_4.php b/includes/Modules/Analytics_4.php
@@ -297,7 +297,7 @@ function ( $audience ) {
 							'adSenseLinkedLastSyncedAt' => 0,
 							'adsLinked'                 => false,
 							'adsLinkedLastSyncedAt'     => 0,
-							'recentEvents'              => array(),
+							'detectedEvents'            => array(),
 							'availableAudiencesLastSyncedAt' => 0,
 						)
 					);

diff --git a/includes/Modules/Analytics_4/Conversion_Reporting/Conversion_Reporting_Events_Sync.php b/includes/Modules/Analytics_4/Conversion_Reporting/Conversion_Reporting_Events_Sync.php
@@ -75,7 +75,7 @@ public function check_for_events() {
 
 		// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 		if ( empty( $report->rowCount ) ) {
-			$this->settings->merge( array( 'recentEvents' => array() ) );
+			$this->settings->merge( array( 'detectedEvents' => array() ) );
 
 			return;
 		}
@@ -84,7 +84,7 @@ public function check_for_events() {
 			$detected_events[] = $row['dimensionValues'][0]['value'];
 		}
 
-		$this->settings->merge( array( 'recentEvents' => $detected_events ) );
+		$this->settings->merge( array( 'detectedEvents' => $detected_events ) );
 	}
 
 	/**

diff --git a/includes/Modules/Analytics_4/Settings.php b/includes/Modules/Analytics_4/Settings.php
@@ -102,7 +102,7 @@ protected function get_default() {
 			'adsLinkedLastSyncedAt'            => 0,
 			'availableAudiences'               => null,
 			'availableAudiencesLastSyncedAt'   => 0,
-			'recentEvents'                     => array(),
+			'detectedEvents'                   => array(),
 		);
 	}
 

diff --git a/...gration/Modules/Analytics_4/Conversion_Reporting/Conversion_Reporting_Events_SyncTest.php b/...gration/Modules/Analytics_4/Conversion_Reporting/Conversion_Reporting_Events_SyncTest.php
@@ -64,7 +64,7 @@ public function test_check_for_events( $detected_events, $report_rows ) {
 		$event_check = $this->get_instance();
 		$event_check->check_for_events();
 
-		$this->assertEquals( $detected_events, $this->settings->get()['recentEvents'] );
+		$this->assertEquals( $detected_events, $this->settings->get()['detectedEvents'] );
 	}
 
 	public function get_instance() {

diff --git a/tests/phpunit/integration/Modules/Analytics_4/SettingsTest.php b/tests/phpunit/integration/Modules/Analytics_4/SettingsTest.php
@@ -86,7 +86,7 @@ public function test_get_default() {
 				'adsLinkedLastSyncedAt'            => 0,
 				'availableAudiences'               => null,
 				'availableAudiencesLastSyncedAt'   => 0,
-				'recentEvents'                     => array(),
+				'detectedEvents'                   => array(),
 			),
 			get_option( Settings::OPTION )
 		);

diff --git a/tests/phpunit/integration/Modules/Analytics_4Test.php b/tests/phpunit/integration/Modules/Analytics_4Test.php
@@ -549,7 +549,7 @@ function ( Request $request ) use ( $property_id, $webdatastream_id, $measuremen
 				'adsLinkedLastSyncedAt'            => 0,
 				'availableAudiences'               => null,
 				'availableAudiencesLastSyncedAt'   => 0,
-				'recentEvents'                     => array(),
+				'detectedEvents'                   => array(),
 			),
 			$options->get( Settings::OPTION )
 		);
@@ -582,7 +582,7 @@ function ( Request $request ) use ( $property_id, $webdatastream_id, $measuremen
 				'adsLinkedLastSyncedAt'            => 0,
 				'availableAudiences'               => null,
 				'availableAudiencesLastSyncedAt'   => 0,
-				'recentEvents'                     => array(),
+				'detectedEvents'                   => array(),
 			),
 			$options->get( Settings::OPTION )
 		);
@@ -708,7 +708,7 @@ function ( Request $request ) use ( $property_id, $webdatastream_id, $measuremen
 				'adsLinkedLastSyncedAt'            => 0,
 				'availableAudiences'               => null,
 				'availableAudiencesLastSyncedAt'   => 0,
-				'recentEvents'                     => array(),
+				'detectedEvents'                   => array(),
 			),
 			$options->get( Settings::OPTION )
 		);
@@ -835,7 +835,7 @@ function ( Request $request ) use ( $property_id, $webdatastream_id, $measuremen
 				'adsLinkedLastSyncedAt'            => 0,
 				'availableAudiences'               => null,
 				'availableAudiencesLastSyncedAt'   => 0,
-				'recentEvents'                     => array(),
+				'detectedEvents'                   => array(),
 			),
 			$options->get( Settings::OPTION )
 		);
@@ -871,7 +871,7 @@ function ( Request $request ) use ( $property_id, $webdatastream_id, $measuremen
 				'adsLinkedLastSyncedAt'            => 0,
 				'availableAudiences'               => null,
 				'availableAudiencesLastSyncedAt'   => 0,
-				'recentEvents'                     => array(),
+				'detectedEvents'                   => array(),
 			),
 			$options->get( Settings::OPTION )
 		);