From 29811634e8954d4b2c20642ef41c40d7194b0483 Mon Sep 17 00:00:00 2001 From: Dennis Ploetner Date: Sat, 8 Jun 2024 16:37:13 +0200 Subject: [PATCH] Tests added --- .../LogWriters/AdminNoticeLogger.php | 87 +++++++++++-------- includes/ContentImport/MetaBox.php | 2 + .../LogWriters/TestAdminNoticeLogger.php | 20 +++++ tests/phpunit/ContentImport/TestMetaBox.php | 20 +++++ 4 files changed, 95 insertions(+), 34 deletions(-) create mode 100644 tests/phpunit/ContentImport/LogWriters/TestAdminNoticeLogger.php create mode 100644 tests/phpunit/ContentImport/TestMetaBox.php diff --git a/includes/ContentImport/LogWriters/AdminNoticeLogger.php b/includes/ContentImport/LogWriters/AdminNoticeLogger.php index 35f1b7d1..dd11d0fa 100644 --- a/includes/ContentImport/LogWriters/AdminNoticeLogger.php +++ b/includes/ContentImport/LogWriters/AdminNoticeLogger.php @@ -2,7 +2,6 @@ namespace lloc\Msls\ContentImport\LogWriters; - use lloc\Msls\ContentImport\ImportCoordinates; use lloc\Msls\MslsRegistryInstance; @@ -15,43 +14,57 @@ class AdminNoticeLogger extends MslsRegistryInstance implements LogWriter { protected $import_coordinates; public function write( array $data ) { - $message = '

' . esc_html__( 'Multisite Language Switcher last import report', - 'multisite-language-switcher' ) . '

'; + /* translators: %1$d: source post ID, %2$d: source blog ID, %3$d: destination post ID, %4$d: destination blog ID */ + $format = esc_html__( 'From post %1$d on site %2$d to post %3$d on site %4$d', 'multisite-language-switcher' ); + + $message = '

' . esc_html__( 'Multisite Language Switcher last import report', 'multisite-language-switcher' ) . '

'; $message .= '' . sprintf( - esc_html__( 'From post %d on site %d to post %d on site %d', 'multisite-language-switcher' ), - $this->import_coordinates->source_post_id, - $this->import_coordinates->source_blog_id, - $this->import_coordinates->dest_post_id, - $this->import_coordinates->dest_blog_id - ) . ''; + $format, + $this->import_coordinates->source_post_id, + $this->import_coordinates->source_blog_id, + $this->import_coordinates->dest_post_id, + $this->import_coordinates->dest_blog_id + ) . ''; if ( ! empty( $data['info'] ) ) { $section_title = esc_html__( 'General information', 'multisite-language-switcher' ); $entries = $data['info']; - $message .= $this->get_section_html( $section_title, $entries ); + $message .= $this->get_section_html( $section_title, $entries ); } if ( ! empty( $data['success'] ) ) { $section_title = esc_html__( 'Details', 'multisite-language-switcher' ); $success_data = $data['success']; - $success_entries = []; + $success_entries = array(); if ( isset( $success_data['post-field']['added'] ) ) { - $success_entries[] = esc_html__( 'The following post fields have been set: ', - 'multisite-language-switcher' ) . - '' . implode( ', ', - array_keys( $success_data['post-field']['added'] ) ) . '.'; + $success_entries[] = esc_html__( + 'The following post fields have been set: ', + 'multisite-language-switcher' + ) . + '' . implode( + ', ', + array_keys( $success_data['post-field']['added'] ) + ) . '.'; } if ( isset( $success_data['meta']['added'] ) ) { - $success_entries[] = esc_html__( 'The following post meta have been set: ', - 'multisite-language-switcher' ) . - '' . implode( ', ', - array_keys( $success_data['meta']['added'] ) ) . '.'; + $success_entries[] = esc_html__( + 'The following post meta have been set: ', + 'multisite-language-switcher' + ) . + '' . implode( + ', ', + array_keys( $success_data['meta']['added'] ) + ) . '.'; } if ( isset( $success_data['term']['added'] ) ) { - $success_entries[] = esc_html__( 'Terms have been assigned to the post for the following taxonomies: ', - 'multisite-language-switcher' ) . - '' . implode( ', ', - array_keys( $success_data['term']['added'] ) ) . '.'; + $success_entries[] = esc_html__( + 'Terms have been assigned to the post for the following taxonomies: ', + 'multisite-language-switcher' + ) . + '' . implode( + ', ', + array_keys( $success_data['term']['added'] ) + ) . '.'; } if ( isset( $success_data['post-thumbnail']['set'] ) ) { $success_entries[] = esc_html__( 'The post thumbnail has been set.', 'multisite-language-switcher' ); @@ -63,18 +76,24 @@ public function write( array $data ) { if ( ! empty( $data['error'] ) ) { $section_title = esc_html__( 'Errors:', 'multisite-language-switcher' ); $error_data = $data['error']; - $error_entries = []; + $error_entries = array(); if ( isset( $error_data['term']['added'] ) || isset( $error_data['term']['created'] ) ) { - $taxonomies = isset( $error_data['term']['added'] ) ? array_keys( $error_data['term']['added'] ) : []; - $taxonomies = isset( $error_data['term']['created'] ) ? array_merge( $taxonomies, - array_keys( $error_data['term']['created'] ) ) : $taxonomies; - $error_entries[] = esc_html__( 'There were issues creating or assigning terms for the following taxonomies: ', - 'multisite-language-switcher' ) . - '' . implode( ', ', $taxonomies ) . '.'; + $taxonomies = isset( $error_data['term']['added'] ) ? array_keys( $error_data['term']['added'] ) : array(); + $taxonomies = isset( $error_data['term']['created'] ) ? array_merge( + $taxonomies, + array_keys( $error_data['term']['created'] ) + ) : $taxonomies; + $error_entries[] = esc_html__( + 'There were issues creating or assigning terms for the following taxonomies: ', + 'multisite-language-switcher' + ) . + '' . implode( ', ', $taxonomies ) . '.'; } if ( isset( $error_data['post-thumbnail']['set'] ) || isset( $error_data['post-thumbnail']['created'] ) ) { - $error_entries[] = esc_html__( 'The post thumbnail could not be created or set.', - 'multisite-language-switcher' ); + $error_entries[] = esc_html__( + 'The post thumbnail could not be created or set.', + 'multisite-language-switcher' + ); } $message .= $this->get_section_html( $section_title, $error_entries, false ); } @@ -87,7 +106,7 @@ public function write( array $data ) { } protected function get_section_html( $section_title, $entries, $escape_entries = true ) { - $html = '

' . $section_title . '

'; + $html = '

' . $section_title . '

'; $html .= '