Skip to content

Commit 4eae85f

Browse files
aristatharistath
authored
Merge pull request #639 from ProgressPlanner/ari/use-arrow-functions
Use arrow functions where appropriate
2 parents 36e0dc6 + 171a9ab commit 4eae85f

21 files changed

Lines changed: 70 additions & 178 deletions

‎classes/activities/class-content-helpers.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ public function get_post_types_names() {
2727
$default = [ 'post', 'page' ];
2828
$include_post_types = \array_filter(
2929
\progress_planner()->get_settings()->get( [ 'include_post_types' ], $default ),
30-
function ( $post_type ) {
31-
return $post_type && \post_type_exists( $post_type ) && \is_post_type_viewable( $post_type );
32-
}
30+
fn( $post_type ) => $post_type && \post_type_exists( $post_type ) && \is_post_type_viewable( $post_type )
3331
);
3432
return empty( $include_post_types ) ? $default : \array_values( $include_post_types );
3533
}

‎classes/admin/widgets/class-activity-scores.php‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -112,37 +112,33 @@ public function get_checklist() {
112112
return [
113113
[
114114
'label' => \esc_html__( 'published content', 'progress-planner' ),
115-
'callback' => function () {
116-
$events = \progress_planner()->get_activities__query()->query_activities(
115+
'callback' => fn() => \count(
116+
\progress_planner()->get_activities__query()->query_activities(
117117
[
118118
'start_date' => new \DateTime( '-7 days' ),
119119
'category' => 'content',
120120
'type' => 'publish',
121121
]
122-
);
123-
return \count( $events ) > 0;
124-
},
122+
)
123+
) > 0,
125124
],
126125
[
127126
'label' => \esc_html__( 'updated content', 'progress-planner' ),
128-
'callback' => function () {
129-
$events = \progress_planner()->get_activities__query()->query_activities(
127+
'callback' => fn() => \count(
128+
\progress_planner()->get_activities__query()->query_activities(
130129
[
131130
'start_date' => new \DateTime( '-7 days' ),
132131
'category' => 'content',
133132
'type' => 'update',
134133
]
135-
);
136-
return \count( $events ) > 0;
137-
},
134+
)
135+
) > 0,
138136
],
139137
[
140138
'label' => 0 === \wp_get_update_data()['counts']['total']
141139
? \esc_html__( 'performed all updates', 'progress-planner' )
142140
: '<a href="' . \esc_url( \admin_url( 'update-core.php' ) ) . '">' . \esc_html__( 'Perform all updates', 'progress-planner' ) . '</a>',
143-
'callback' => function () {
144-
return ! \wp_get_update_data()['counts']['total'];
145-
},
141+
'callback' => fn() => ! \wp_get_update_data()['counts']['total'],
146142
],
147143
];
148144
}

‎classes/admin/widgets/class-content-activity.php‎

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@ public function get_chart_args_content_count( $type = 'publish', $color = '#5347
3131
return \array_merge(
3232
$this->get_chart_args( $type, $color ),
3333
[
34-
'count_callback' => function ( $activities, $date = null ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed
35-
return \count( $activities );
36-
},
34+
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed
35+
'count_callback' => fn( $activities, $date = null ) => \count( $activities ),
3736
'return_data' => [ 'label', 'score' ],
3837
]
3938
);
@@ -50,26 +49,22 @@ public function get_chart_args_content_count( $type = 'publish', $color = '#5347
5049
public function get_chart_args( $type = 'publish', $color = '#534786' ) {
5150
return [
5251
'type' => 'line',
53-
'items_callback' => function ( $start_date, $end_date ) use ( $type ) {
54-
return \progress_planner()->get_activities__query()->query_activities(
55-
[
56-
'category' => 'content',
57-
'start_date' => $start_date,
58-
'end_date' => $end_date,
59-
'type' => $type,
60-
]
61-
);
62-
},
52+
'items_callback' => fn( $start_date, $end_date ) => \progress_planner()->get_activities__query()->query_activities(
53+
[
54+
'category' => 'content',
55+
'start_date' => $start_date,
56+
'end_date' => $end_date,
57+
'type' => $type,
58+
]
59+
),
6360
'dates_params' => [
6461
'start_date' => \DateTime::createFromFormat( 'Y-m-d', \gmdate( 'Y-m-01' ) )->modify( $this->get_range() ),
6562
'end_date' => new \DateTime(),
6663
'frequency' => $this->get_frequency(),
6764
'format' => 'M',
6865
],
6966
'filter_results' => [ $this, 'filter_activities' ],
70-
'color' => function () use ( $color ) {
71-
return $color;
72-
},
67+
'color' => fn() => $color,
7368
];
7469
}
7570

@@ -83,11 +78,10 @@ public function get_chart_args( $type = 'publish', $color = '#534786' ) {
8378
public function filter_activities( $activities ) {
8479
return \array_filter(
8580
$activities,
86-
function ( $activity ) {
87-
$post = $activity->get_post();
88-
return 'delete' === $activity->type || ( \is_object( $post )
89-
&& \in_array( $post->post_type, \progress_planner()->get_activities__content_helpers()->get_post_types_names(), true ) );
90-
}
81+
fn( $activity ) => 'delete' === $activity->type
82+
|| ( \is_object( $activity->get_post() )
83+
&& \in_array( $activity->get_post()->post_type, \progress_planner()->get_activities__content_helpers()->get_post_types_names(), true )
84+
)
9185
);
9286
}
9387
}

‎classes/badges/class-badge-maintenance.php‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,14 @@ public function get_goal() {
3737
'description' => \esc_html__( 'Streak: The number of weeks this goal has been accomplished consistently.', 'progress-planner' ),
3838
'status' => 'active',
3939
'priority' => 'low',
40-
'evaluate' => function ( $goal_object ) {
41-
return \count(
42-
\progress_planner()->get_activities__query()->query_activities(
43-
[
44-
'start_date' => $goal_object->get_details()['start_date'],
45-
'end_date' => $goal_object->get_details()['end_date'],
46-
]
47-
)
48-
);
49-
},
40+
'evaluate' => fn( $goal_object ) => \count(
41+
\progress_planner()->get_activities__query()->query_activities(
42+
[
43+
'start_date' => $goal_object->get_details()['start_date'],
44+
'end_date' => $goal_object->get_details()['end_date'],
45+
]
46+
)
47+
),
5048
],
5149
[
5250
'frequency' => 'weekly',

‎classes/class-plugin-migrations.php‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,21 +77,11 @@ public function maybe_upgrade() {
7777
if ( ! \is_array( $updates_files ) ) {
7878
return;
7979
}
80-
$updates = \array_map(
81-
function ( $file ) {
82-
return \str_replace( 'class-update-', '', \basename( $file, '.php' ) );
83-
},
84-
$updates_files
85-
);
80+
$updates = \array_map( fn( $file ) => \str_replace( 'class-update-', '', \basename( $file, '.php' ) ), $updates_files );
8681
\sort( $updates );
8782

8883
// Remove "class-update" from the updates.
89-
$updates = \array_filter(
90-
$updates,
91-
function ( $update ) {
92-
return $update !== 'class-update';
93-
}
94-
);
84+
$updates = \array_filter( $updates, fn( $update ) => $update !== 'class-update' );
9585

9686
// Run the upgrades.
9787
foreach ( $updates as $version_int ) {

‎classes/class-suggested-tasks.php‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -557,11 +557,7 @@ public function check_show_all_recommendations( $max_items_per_category ) {
557557
isset( $_GET['prpl_show_all_recommendations'] ) // phpcs:ignore WordPress.Security.NonceVerification.Recommended
558558
&& \current_user_can( 'manage_options' ) // phpcs:ignore WordPress.Security.NonceVerification.Recommended
559559
)
560-
? \array_map(
561-
function () {
562-
return 99;
563-
},
564-
$max_items_per_category
565-
) : $max_items_per_category;
560+
? \array_map( fn() => 99, $max_items_per_category )
561+
: $max_items_per_category;
566562
}
567563
}

‎classes/suggested-tasks/data-collector/class-yoast-orphaned-content.php‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,7 @@ protected function calculate_data() {
6969
$post_types_in = '';
7070

7171
if ( ! empty( $public_post_types ) ) {
72-
$post_types_in = \array_map(
73-
function ( $type ) {
74-
return (string) \esc_sql( $type );
75-
},
76-
\array_values( $public_post_types )
77-
);
72+
$post_types_in = \array_map( fn( $type ) => (string) \esc_sql( $type ), \array_values( $public_post_types ) );
7873
$post_types_in = "p.post_type IN ('" . \implode( "','", $post_types_in ) . "')";
7974

8075
$where_clause .= " AND $post_types_in";

‎classes/suggested-tasks/providers/class-select-locale.php‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,10 @@ protected function get_locales() {
151151

152152
// Get the locales.
153153
$locales = \array_map(
154-
function ( $locale ) {
155-
return [
156-
'code' => $locale['language'],
157-
'name' => $locale['native_name'],
158-
];
159-
},
154+
fn( $locale ) => [
155+
'code' => $locale['language'],
156+
'name' => $locale['native_name'],
157+
],
160158
$locales['translations']
161159
);
162160

‎classes/suggested-tasks/providers/class-tasks.php‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -678,12 +678,7 @@ public function get_task_actions( $data = [] ) {
678678
}
679679

680680
// Order actions by priority.
681-
\usort(
682-
$actions,
683-
function ( $a, $b ) {
684-
return $a['priority'] - $b['priority'];
685-
}
686-
);
681+
\usort( $actions, fn( $a, $b ) => $a['priority'] - $b['priority'] );
687682

688683
$return_actions = [];
689684
foreach ( $actions as $action ) {

‎classes/ui/class-branding.php‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,7 @@ public function filter_widgets( $widgets ) {
226226
return $widgets;
227227
}
228228

229-
return \array_filter(
230-
$widgets,
231-
function ( $widget ) use ( $show_papers ) {
232-
return \in_array( $widget->get_id(), $show_papers, true );
233-
}
234-
);
229+
return \array_filter( $widgets, fn( $widget ) => \in_array( $widget->get_id(), $show_papers, true ) );
235230
}
236231

237232
/**

0 commit comments

Comments
 (0)