Merge branch 'develop' into filip/check-user-capability

Emilia-Capital · Dec 20, 2024 · f8723c6 · f8723c6
2 parents ef54495 + 1f91923
commit f8723c6
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 30 deletions.
diff --git a/classes/class-chart.php b/classes/class-chart.php
@@ -29,9 +29,7 @@ public function the_chart( $args = [] ) {
 	 * Get data for the chart.
 	 *
 	 * @param array $args The arguments for the chart.
-	 *                    ['query_params']   The query parameters.
-	 *                                       See \Progress_Planner\Query::query_activities for the available parameters.
-	 *
+	 *                    ['items_callback'] The callback to get items.
 	 *                    ['filter_results'] The callback to filter the results. Leave empty/null to skip filtering.
 	 *                    ['dates_params']   The dates parameters for the query.
 	 *                                    ['start_date'] The start date for the chart.
@@ -50,7 +48,9 @@ public function get_chart_data( $args = [] ) {
 		$args = \wp_parse_args(
 			$args,
 			[
-				'query_params'   => [],
+				'items_callback' => function ( $start_date, $end_date ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter
+					return 0;
+				},
 				'filter_results' => null,
 				'dates_params'   => [],
 				'normalized'     => false,
@@ -83,15 +83,7 @@ public function get_chart_data( $args = [] ) {
 		if ( $args['normalized'] ) {
 			$previous_month_start       = ( clone $periods[0]['start_date'] )->modify( '-1 month' );
 			$previous_month_end         = ( clone $periods[0]['start_date'] )->modify( '-1 day' );
-			$previous_period_activities = \progress_planner()->get_query()->query_activities(
-				array_merge(
-					$args['query_params'],
-					[
-						'start_date' => $previous_month_start,
-						'end_date'   => $previous_month_end,
-					]
-				)
-			);
+			$previous_period_activities = $args['items_callback']( $previous_month_start, $previous_month_end );
 			if ( $args['filter_results'] ) {
 				$activities = $args['filter_results']( $activities );
 			}
@@ -124,15 +116,7 @@ public function get_chart_data( $args = [] ) {
 	 */
 	public function get_period_data( $period, $args, $previous_period_activities ) {
 		// Get the activities for the period.
-		$activities = \progress_planner()->get_query()->query_activities(
-			array_merge(
-				$args['query_params'],
-				[
-					'start_date' => $period['start_date'],
-					'end_date'   => $period['end_date'],
-				]
-			)
-		);
+		$activities = $args['items_callback']( $period['start_date'], $period['end_date'] );
 		// Filter the results if a callback is provided.
 		if ( $args['filter_results'] ) {
 			$activities = $args['filter_results']( $activities );

diff --git a/classes/class-rest-api-stats.php b/classes/class-rest-api-stats.php
@@ -117,7 +117,14 @@ public function get_stats( \WP_REST_Request $request ) {
 
 		$scores = \progress_planner()->get_chart()->get_chart_data(
 			[
-				'query_params'   => [],
+				'items_callback' => function ( $start_date, $end_date ) {
+					return \progress_planner()->get_query()->query_activities(
+						[
+							'start_date' => $start_date,
+							'end_date'   => $end_date,
+						]
+					);
+				},
 				'dates_params'   => [
 					'start_date' => \DateTime::createFromFormat( 'Y-m-d', \gmdate( 'Y-m-01' ) )->modify( '-6 months' ),
 					'end_date'   => new \DateTime(),

diff --git a/classes/widgets/class-published-content.php b/classes/widgets/class-published-content.php
@@ -99,10 +99,16 @@ public function get_chart_args_content_count() {
 	public function get_chart_args() {
 		return [
 			'type'           => 'line',
-			'query_params'   => [
-				'category' => 'content',
-				'type'     => 'publish',
-			],
+			'items_callback' => function ( $start_date, $end_date ) {
+				return \progress_planner()->get_query()->query_activities(
+					[
+						'category'   => 'content',
+						'type'       => 'publish',
+						'start_date' => $start_date,
+						'end_date'   => $end_date,
+					]
+				);
+			},
 			'dates_params'   => [
 				'start_date' => \DateTime::createFromFormat( 'Y-m-d', \gmdate( 'Y-m-01' ) )->modify( $this->get_range() ),
 				'end_date'   => new \DateTime(),

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -14,5 +14,3 @@ parameters:
     - '#Call to an undefined method Progress_Planner\\Base\:\:get_[a-zA-Z0-9\\_]+().#'
     - '#Cannot call method modify\(\) on DateTime\|false.#'
     - '#Cannot call method format\(\) on DateTime\|false.#'
-    - '#Parameter \#1 \$[a-zA-Z0-9\\_]+ of function esc_attr expects string, mixed given.#'
-    - '#Parameter \#1 \$[a-zA-Z0-9\\_]+ of function sanitize_text_field expects string, mixed given.#'
diff --git a/views/page-widgets/activity-scores.php b/views/page-widgets/activity-scores.php
@@ -56,7 +56,14 @@ class="prpl-info-icon"
 	\progress_planner()->get_chart()->the_chart(
 		[
 			'type'           => 'bar',
-			'query_params'   => [],
+			'items_callback' => function ( $start_date, $end_date ) {
+				return \progress_planner()->get_query()->query_activities(
+					[
+						'start_date' => $start_date,
+						'end_date'   => $end_date,
+					]
+				);
+			},
 			'dates_params'   => [
 				'start_date' => \DateTime::createFromFormat( 'Y-m-d', \gmdate( 'Y-m-01' ) )->modify( $prpl_widget->get_range() ),
 				'end_date'   => new \DateTime(),