Block reorg

build/exclude

@@ -4,6 +4,7 @@
 /bin/
 /build/
 /docs/
+/js/msls-widget-block/
 /legacy-tests/
 /release/
 /multisite-language-switcher/

composer.json

@@ -12,7 +12,7 @@
   "require-dev": {
     "phpunit/phpunit": "^9.6",
     "brain/monkey": "^2.6",
-    "phpstan/phpstan": "^1.10",
+    "phpstan/phpstan": "^1.11",
     "szepeviktor/phpstan-wordpress": "^1.3",
     "phpstan/extension-installer": "^1.3",
     "antecedent/patchwork": "^2.1",

includes/MslsAdmin.php

@@ -95,7 +95,7 @@ public function get_options_page_link() {
 	public function __call( $method, $args ) {
 		$parts = explode( '_', $method, 2 );
 
-		if ( 'rewrite' === $parts[0] ) {
+		if ( is_array( $parts ) && 'rewrite' === $parts[0] ) {
 			return $this->render_rewrite( $parts[1] );
 		}
 

includes/MslsAdminIconTaxonomy.php

@@ -28,11 +28,9 @@ class MslsAdminIconTaxonomy extends MslsAdminIcon {
 	 * @uses get_edit_term_link()
 	 */
 	public function set_href( int $id ): MslsAdminIcon {
-		$this->href = get_edit_term_link(
-			$id,
-			$this->type,
-			MslsTaxonomy::instance()->get_post_type()
-		);
+        $object_type = MslsTaxonomy::instance()->get_post_type();
+
+		$this->href = get_edit_term_link( $id, $this->type, $object_type );
 
 		return $this;
 	}
@@ -41,16 +39,13 @@ public function set_href( int $id ): MslsAdminIcon {
 	 * Set the path by type
 	 *
 	 * @return MslsAdminIconTaxonomy
-	 * @uses add_query_arg()
 	 *
 	 */
 	public function set_path(): MslsAdminIcon {
 		$args      = [ 'taxonomy' => $this->type ];
 		$post_type = MslsTaxonomy::instance()->get_post_type();
 
-		if ( ! empty( $post_type ) ) {
-			$args['post_type'] = $post_type;
-		}
+        $post_type !== '' && $args['post_type'] = $post_type;
 
 		$this->path = add_query_arg( $args, $this->path );
 

includes/MslsCustomColumn.php

@@ -53,13 +53,11 @@ public function th( $columns ) {
 			foreach ( $blogs as $blog ) {
 				$language = $blog->get_language();
 
-				$icon = new MslsAdminIcon( null );
+                $icon_type=  $this->options->admin_display === 'label' ? 'label' : 'flag';
+
+                $icon = new MslsAdminIcon( null );
 				$icon->set_language( $language );
-				if ( $this->options->admin_display === 'label' ) {
-					$icon->set_icon_type( 'label' );
-				} else {
-					$icon->set_icon_type( 'flag' );
-				}
+                $icon->set_icon_type( $icon_type );
 
 				if ( $post_id = get_the_ID() ) {
 					$icon->set_id( $post_id );

includes/MslsCustomFilter.php

@@ -41,9 +41,9 @@ public static function init() {
 	 * Echo's select tag with list of blogs
 	 * @uses selected
 	 */
-	public function add_filter() {
+	public function add_filter(): void {
 		$id = (
-		filter_has_var( INPUT_GET, 'msls_filter' ) ?
+		    filter_has_var( INPUT_GET, 'msls_filter' ) ?
 			filter_input( INPUT_GET, 'msls_filter', FILTER_SANITIZE_NUMBER_INT ) :
 			''
 		);

includes/MslsPlugin.php

@@ -172,7 +172,7 @@ public function content_filter( $content ) {
 	 *
 	 * @return string
 	 */
-	function filter_string( $pref = '<p id="msls">', $post = '</p>' ) {
+	public function filter_string( $pref = '<p id="msls">', $post = '</p>' ) {
 		$obj    = MslsOutput::init();
 		$links  = $obj->get( 1, true, true );
 		$output = __( 'This post is also available in %s.', 'multisite-language-switcher' );
@@ -217,31 +217,8 @@ function filter_string( $pref = '<p id="msls">', $post = '</p>' ) {
 	 */
 	public function block_init() {
 		if ( ! $this->options->is_excluded() ) {
-			$handle   = 'msls-widget-block';
-			$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
-			);
-
-			register_block_type( 'lloc/msls-widget-block', [
-				'attributes'      => [ 'title' => [ 'type' => 'string' ] ],
-				'editor_script'   => $handle,
-				'render_callback' => $callback,
-			] );
-
-			add_shortcode( 'sc_msls_widget', $callback );
+            register_block_type( self::plugin_dir_path('js/msls-widget-block' ) );
+            add_shortcode( 'sc_msls_widget', [ $this, 'block_render' ] );
 
 			return true;
 		}
@@ -274,15 +251,15 @@ public function custom_enqueue() {
 			return false;
 		}
 
-		$ver     = defined( 'MSLS_PLUGIN_VERSION' ) ? constant( 'MSLS_PLUGIN_VERSION' ) : false;
-		$postfix = defined( 'SCRIPT_DEBUG' ) && constant( 'SCRIPT_DEBUG' ) ? '' : '.min';
+		$ver    = defined( 'MSLS_PLUGIN_VERSION' ) ? constant( 'MSLS_PLUGIN_VERSION' ) : false;
+		$folder = defined( 'SCRIPT_DEBUG' ) && constant( 'SCRIPT_DEBUG' ) ? 'src' : 'js';
 
 		wp_enqueue_style( 'msls-styles', self::plugins_url( 'css/msls.css' ), [], $ver );
 		wp_enqueue_style( 'msls-flags', self::plugins_url( 'css-flags/css/flag-icon.min.css' ), [], $ver );
 
 		if ( $this->options->activate_autocomplete ) {
 			wp_enqueue_script( 'msls-autocomplete',
-				self::plugins_url( "js/msls{$postfix}.js" ),
+				self::plugins_url( "$folder/msls.js" ),
 				[ 'jquery-ui-autocomplete' ],
 				$ver );
 

js/msls-widget-block/block.json

@@ -0,0 +1,17 @@
+{
+  "$schema": "https://schemas.wp.org/trunk/block.json",
+  "apiVersion": 3,
+  "title": "Multisite Language Switcher",
+  "icon": "translation",
+  "category": "widgets",
+  "name": "lloc/msls-widget-block",
+  "version": "2.6.4",
+  "description": "Review the settings for the Multisite Language Switcher plugin, as the block utilizes the API function `the_msls()` for its output.",
+  "example": {},
+  "supports": {
+    "html": false
+  },
+  "textdomain": "multisite-language-switcher",
+  "editorScript": "file:./index.js",
+  "render": "file:./render.php"
+}

js/msls-widget-block/index.asset.php

@@ -0,0 +1 @@
+<?php return array('dependencies' => array('react', 'wp-block-editor', 'wp-blocks', 'wp-server-side-render'), 'version' => 'cc5b60bf835008a66743');

js/msls-widget-block/render.php

@@ -0,0 +1,3 @@
+<?php
+
+the_msls();

package.json

@@ -1,8 +1,9 @@
 {
   "scripts": {
-    "uglify": "uglifyjs js/msls.js > js/msls.min.js",
+    "uglify": "uglifyjs src/msls.js > js/msls.js",
     "less": "lessc css/msls.less css/msls.css --clean-css=\"--s1 --advanced\"",
-    "build": "npm run uglify && npm run less"
+    "build-msls-block": "wp-scripts build src/msls-widget-block/index.js --webpack-src-dir=src/msls-widget-block --output-path=js/msls-widget-block",
+    "build": "npm run uglify && npm run less && npm run build-msls-block"
   },
   "dependencies": {
     "less": "^4.2.0",
@@ -11,6 +12,7 @@
   },
   "devDependencies": {
     "@playwright/test": "^1.44.0",
+    "@wordpress/scripts": "^27.9.0",
     "@types/node": "^20.12.11"
   }
 }

patchwork.json

@@ -1 +1 @@
-{"redefinable-internals": ["filter_input_array"]}
+{"redefinable-internals": ["filter_input_array", "filter_has_var"]}

phpunit.xml

@@ -7,6 +7,7 @@
   </coverage>
   <php>
     <const name="MSLS_PLUGIN_PATH" value="multisite-language-switcher/MultisiteLanguageSwitcher.php"/>
+    <const name="MSLS_PLUGIN__FILE__" value="/var/www/html/wp-content/plugins/multisite-language-switcher/MultisiteLanguageSwitcher.php"/>
     <const name="WP_DEBUG" value="true"/>
   </php>
   <testsuite name="Internal tests">

readme.txt

@@ -3,7 +3,7 @@
 Contributors: realloc, lucatume
 Donate link: https://www.greenpeace.org/international/
 Tags: multilingual, multisite, language, switcher, localization
-Requires at least: 5.3
+Requires at least: 6.1
 Tested up to: 6.5
 Requires PHP: 7.4
 Stable tag: 2.6.4

src/index.php

@@ -0,0 +1,3 @@
+<?php
+// Silence is golden.
+

src/msls-widget-block/block.json

@@ -0,0 +1,17 @@
+{
+  "$schema": "https://schemas.wp.org/trunk/block.json",
+  "apiVersion": 3,
+  "title": "Multisite Language Switcher",
+  "icon": "translation",
+  "category": "widgets",
+  "name": "lloc/msls-widget-block",
+  "version": "2.6.4",
+  "description": "Review the settings for the Multisite Language Switcher plugin, as the block utilizes the API function `the_msls()` for its output.",
+  "example": {},
+  "supports": {
+    "html": false
+  },
+  "textdomain": "multisite-language-switcher",
+  "editorScript": "file:./index.js",
+  "render": "file:./render.php"
+}

src/msls-widget-block/edit.js

@@ -0,0 +1,14 @@
+import ServerSideRender from '@wordpress/server-side-render';
+import { useBlockProps } from '@wordpress/block-editor';
+
+export default function Edit(props) {
+    const blockProps = useBlockProps();
+    return (
+        <div { ...blockProps }>
+            <ServerSideRender
+                block="lloc/msls-widget-block"
+                attributes={ props.attributes }
+            />
+        </div>
+    );
+}

src/msls-widget-block/index.js

@@ -0,0 +1,8 @@
+import { registerBlockType } from '@wordpress/blocks';
+
+import Edit from './edit';
+import metadata from './block.json';
+
+registerBlockType(metadata.name, {
+  edit: Edit
+} );

src/msls-widget-block/index.php

@@ -0,0 +1,3 @@
+<?php
+// Silence is golden.
+

src/msls-widget-block/render.php

@@ -0,0 +1,3 @@
+<?php
+
+the_msls();