Merge pull request #268 from lloc/double-output

Tests adjusted
lloc · Jan 6, 2024 · 5629f6e · 5629f6e
2 parents 9817042 + f61275c
commit 5629f6e
Show file tree

Hide file tree

Showing 6 changed files with 149 additions and 86 deletions.
diff --git a/includes/MslsPlugin.php b/includes/MslsPlugin.php
@@ -220,15 +220,16 @@ public function block_init() {
 			$callback = [ $this, 'block_render' ];
 
 			global $pagenow;
-            		$toLoad = [ 'wp-blocks', 'wp-element', 'wp-components' ];
-            		if ( $pagenow === 'widgets.php' ) $toLoad[] = 'wp-edit-widgets';
-            		else $toLoad[] = 'wp-editor';
-
-            		wp_register_script(
-                		$handle,
-                		self::plugins_url( 'js/msls-widget-block.js' ),
-                		$toLoad
-            		);
+
+            $toLoad = [ 'wp-blocks', 'wp-element', 'wp-components' ];
+            if ( $pagenow === 'widgets.php' ) $toLoad[] = 'wp-edit-widgets';
+            else $toLoad[] = 'wp-editor';
+
+            wp_register_script(
+                $handle,
+                self::plugins_url( 'js/msls-widget-block.js' ),
+                $toLoad
+            );
 
 			register_block_type( 'lloc/msls-widget-block', [
 				'attributes'      => [ 'title' => [ 'type' => 'string' ] ],

diff --git a/includes/MslsPostTag.php b/includes/MslsPostTag.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * MslsPostTag
+ *
  * @author Dennis Ploetner <[email protected]>
  * @since 0.9.8
  */
@@ -9,6 +10,7 @@
 
 /**
  * Post Tag
+ *
  * @package Msls
  */
 class MslsPostTag extends MslsMain {
@@ -27,12 +29,12 @@ public static function suggest() {
 				filter_input( INPUT_POST, 'blog_id', FILTER_SANITIZE_NUMBER_INT )
 			);
 
-			$args = array(
+			$args = [
 				'orderby'    => 'name',
 				'order'      => 'ASC',
 				'number'     => 10,
 				'hide_empty' => 0,
-			);
+			];
 
 			if ( filter_has_var( INPUT_POST, 's' ) ) {
 				$args['search'] = sanitize_text_field(
@@ -69,20 +71,13 @@ public static function suggest() {
 	/**
 	 * Init
 	 *
-	 * @codeCoverageIgnore
-	 *
 	 * @return MslsPostTag
 	 */
 	public static function init() {
 		$options    = MslsOptions::instance();
 		$collection = msls_blog_collection();
-
-		if ( $options->activate_autocomplete	) {
-			$obj = new static( $options, $collection );
-		}
-		else {
-			$obj = new MslsPostTagClassic( $options, $collection );
-		}
+		$class      = $options->activate_autocomplete ? MslsPostTag::class : MslsPostTagClassic::class;
+		$obj        = new $class( $options, $collection );
 
 		$taxonomy = MslsContentTypes::create()->acl_request();
 		if ( '' != $taxonomy ) {
@@ -98,9 +93,13 @@ public static function init() {
 	/**
 	 * Add the input fields to the add-screen of the taxonomies
 	 *
-	 * @param \StdClass $tag
+	 * @param string $taxonomy
 	 */
-	public function add_input( $tag ) {
+	public function add_input( string $taxonomy ): void {
+		if ( did_action( "{$taxonomy}_add_form_fields" ) !== 1 ) {
+			return;
+		}
+
 		$title_format = '<h3>%s</h3>
 			<input type="hidden" name="msls_post_type" id="msls_post_type" value="%s"/>
 			<input type="hidden" name="msls_action" id="msls_action" value="suggest_terms"/>';
@@ -110,15 +109,20 @@ public function add_input( $tag ) {
 			<input class="msls_title" id="msls_title_%1$s" name="msls_title_%1$s" type="text" value="%5$s"/>';
 
 		echo '<div class="form-field">';
-		$this->the_input( $tag, $title_format, $item_format );
+		$this->the_input( $taxonomy, $title_format, $item_format );
 		echo '</div>';
 	}
 
 	/**
 	 * Add the input fields to the edit-screen of the taxonomies
-	 * @param \StdClass $tag
+	 *
+	 * @param string $taxonomy
 	 */
-	public function edit_input( $tag ) {
+	public function edit_input( string $taxonomy ): void {
+		if ( did_action( "{$taxonomy}_edit_form_fields" ) !== 1 ) {
+			return;
+		}
+
 		$title_format = '<tr>
 			<th colspan="2">
 			<strong>%s</strong>
@@ -128,7 +132,7 @@ public function edit_input( $tag ) {
 			</tr>';
 
 		$item_format = '<tr class="form-field">
-			<th scope="row" valign="top">
+			<th scope="row">
 			<label for="msls_title_%1$s">%2$s</label>
 			</th>
 			<td>
@@ -137,15 +141,18 @@ public function edit_input( $tag ) {
 			</td>
 			</tr>';
 
-		$this->the_input( $tag, $title_format, $item_format );
+		$this->the_input( $taxonomy, $title_format, $item_format );
 	}
 
 	/**
 	 * Print the input fields
+	 *
 	 * Returns true if the blogcollection is not empty
-	 * @param \StdClass $tag
+	 *
+	 * @param mixed $tag
 	 * @param string $title_format
 	 * @param string $item_format
+	 *
 	 * @return boolean
 	 */
 	public function the_input( $tag, $title_format, $item_format ) {
@@ -156,7 +163,7 @@ public function the_input( $tag, $title_format, $item_format ) {
 
 			$this->maybe_set_linked_term( $my_data );
 
-			$type    = MslsContentTypes::create()->get_request();
+			$type = MslsContentTypes::create()->get_request();
 
 			printf(
 				$title_format,
@@ -166,17 +173,13 @@ public function the_input( $tag, $title_format, $item_format ) {
 				),
 				$type
 			);
+
 			foreach ( $blogs as $blog ) {
 				switch_to_blog( $blog->userblog_id );
 
-				$language = $blog->get_language();
-				$icon     = MslsAdminIcon::create()
-								->set_language( $language );
-				if( $this->options->admin_display === 'label' ) {
-					$icon->set_icon_type( 'label' );
-				} else {
-					$icon->set_icon_type( 'flag' );
-				}
+				$language  = $blog->get_language();
+				$icon_type = $this->options->get_icon_type();
+				$icon      = MslsAdminIcon::create()->set_language( $language )->set_icon_type( $icon_type );
 
 				$value = $title = '';
 				if ( $my_data->has_value( $language ) ) {
@@ -188,23 +191,20 @@ public function the_input( $tag, $title_format, $item_format ) {
 					}
 				}
 
-				printf(
-					$item_format,
-					$blog->userblog_id,
-					$icon,
-					$language,
-					$value,
-					$title
-				);
+				printf( $item_format, $blog->userblog_id, $icon, $language, $value, $title );
+
 				restore_current_blog();
 			}
+
 			return true;
 		}
+
 		return false;
 	}
 
 	/**
 	 * Set calls the save method if taxonomy is set
+	 *
 	 * @param int $term_id
  	 * @codeCoverageIgnore
 	 */

diff --git a/includes/MslsPostTagClassic.php b/includes/MslsPostTagClassic.php
@@ -8,16 +8,22 @@
 namespace lloc\Msls;
 
 /**
- * Post Tag Clasic
+ * Post Tag Classic
+ *
  * @package Msls
  */
 class MslsPostTagClassic extends MslsPostTag {
 
 	/**
 	 * Add the input fields to the add-screen of the taxonomies
-	 * @param \StdClass $tag
+	 *
+	 * @param string $taxonomy
 	 */
-	public function add_input( $tag ): void {
+	public function add_input( string $taxonomy ): void {
+		if ( did_action( "{$taxonomy}_add_form_fields" ) !== 1 ) {
+			return;
+		}
+
 		$title_format = '<h3>%s</h3>';
 
 		$item_format = '<label for="msls_input_%1$s">%2$s</label>
@@ -27,15 +33,20 @@ public function add_input( $tag ): void {
 			</select>';
 
 		echo '<div class="form-field">';
-		$this->the_input( $tag, $title_format, $item_format );
+		$this->the_input( $taxonomy, $title_format, $item_format );
 		echo '</div>';
 	}
 
 	/**
 	 * Add the input fields to the edit-screen of the taxonomies
-	 * @param \StdClass $tag
+	 *
+	 * @param string $taxonomy
 	 */
-	public function edit_input( $tag ): void {
+	public function edit_input( string $taxonomy ): void {
+		if ( did_action( "{$taxonomy}_edit_form_fields" ) !== 1 ) {
+			return;
+		}
+
 		$title_format = '<tr>
 			<th colspan="2">
 			<strong>%s</strong>
@@ -52,7 +63,7 @@ public function edit_input( $tag ): void {
 			</select></td>
 			</tr>';
 
-		$this->the_input( $tag, $title_format, $item_format );
+		$this->the_input( $taxonomy, $title_format, $item_format );
 	}
 
 	/**
@@ -67,22 +78,16 @@ public function edit_input( $tag ): void {
 	public function print_option( MslsBlog $blog, string $type, MslsOptionsTax $mydata, string $item_format ): void {
 		switch_to_blog( $blog->userblog_id );
 
-		$language = $blog->get_language();
-		$icon     = MslsAdminIcon::create()
-			->set_language( $language );
-
-		if( $this->options->admin_display === 'label' ) {
-			$icon->set_icon_type( 'label' );
-		} else {
-			$icon->set_icon_type( 'flag' );			
-		}
-		$options  = '';
-		$terms    = get_terms( [ 'taxonomy' => $type, 'hide_empty' => false ] );
+		$language  = $blog->get_language();
+		$icon_type = $this->options->get_icon_type();
+		$icon      = MslsAdminIcon::create()->set_language( $language )->set_icon_type( $icon_type );
 
 		if ( $mydata->has_value( $language ) ) {
 			$icon->set_href( $mydata->$language );
 		}
 
+		$options  = '';
+		$terms    = get_terms( [ 'taxonomy' => $type, 'hide_empty' => false ] );
 		if ( ! empty( $terms ) ) {
 			foreach ( $terms as $term ) {
 				$options .= sprintf(
@@ -103,7 +108,7 @@ public function print_option( MslsBlog $blog, string $type, MslsOptionsTax $myda
 	 * Print the input fields
 	 * Returns true if the blogcollection is not empty
 	 *
-	 * @param \StdClass $tag
+	 * @param mixed $tag
 	 * @param string $title_format
 	 * @param string $item_format
 	 * @return boolean

diff --git a/includes/MslsWidget.php b/includes/MslsWidget.php
@@ -19,13 +19,9 @@ class MslsWidget extends \WP_Widget {
 	 * Constructor
 	 */
 	public function __construct() {
-		parent::__construct( 
-			$this->id_base, 
-			apply_filters(
-				'msls_widget_title',
-				__( 'Multisite Language Switcher', 'multisite-language-switcher' ) 
-			)
-		);
+		$name = apply_filters('msls_widget_title', __( 'Multisite Language Switcher', 'multisite-language-switcher' ) );
+
+		parent::__construct( $this->id_base, $name, [ 'show_instance_in_rest' => true ] );
 	}
 
 	/**

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -13,7 +13,7 @@ class Msls_UnitTestCase extends TestCase {
 	 *
 	 * @var object $test
 	 */
-	protected $test;
+	protected object $test;
 
 	protected function setUp(): void {
 		parent::setUp();