Merge branch 'master' into dependabot/composer/phpunit/phpunit-tw-11

.distignore

@@ -15,7 +15,6 @@
 .distignore
 .gitattributes
 .gitignore
-
 .scrutinizer.yml
 Changelog.md
 Diagrams.md
@@ -30,4 +29,5 @@ phpdoc.xml
 phpstan.neon
 phpunit.xml
 playwright.config.ts
-setup.sh
+setup.sh
+multisite-language-switcher.zip

.github/workflows/assets-update.yml

@@ -0,0 +1,18 @@
+name: Plugin asset/readme update
+on:
+  push:
+    branches:
+      - master
+jobs:
+  trunk:
+    name: Push to trunk
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: WordPress.org plugin asset/readme update
+        uses: 10up/action-wordpress-plugin-asset-update@stable
+        env:
+          SLUG: multisite-language-switcher
+          SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
+          SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
+          IGNORE_OTHER_FILES: true

.github/workflows/plugin-check.yml

@@ -4,8 +4,6 @@ on: # rebuild any PRs and main branch changes
   push:
     branches:
       - master
-      - 'releases/*'
-
 jobs:
   test:
     runs-on: ubuntu-latest

.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 .idea/
 .phpunit.result.cache
 .phpunit.cache

Changelog.md

@@ -1,5 +1,21 @@
+## 2.9.4
+
+- fix: type casting for msls_id in render_option call
+
+## 2.9.3
+
+- bugfix Welsh css flag
+
 ## 2.9.2
 
+- Addressed some of the errors that were reported by PHPStan
+- Upgrade of PHPUnit to version 10
+- Raise coverage
+- Plugin check workflow added and existing workflows updated
+- Updated JS dependencies
+- Fix for build script
+- Security fixes
+- Fix double output
 
 ## 2.9.1
 

MultisiteLanguageSwitcher.php

@@ -7,7 +7,7 @@
  * @wordpress-plugin
  *
  * Plugin Name: Multisite Language Switcher
- * Version: 2.9.2
+ * Version: 2.9.4
  * Plugin URI: http://msls.co/
  * Description: A simple but powerful plugin that will help you to manage the relations of your contents in a multilingual multisite-installation.
  * Author: Dennis Ploetner
@@ -40,7 +40,7 @@
  * @author Dennis Ploetner <[email protected]>
  */
 if ( ! defined( 'MSLS_PLUGIN_VERSION' ) ) {
-	define( 'MSLS_PLUGIN_VERSION', '2.9.2' );
+	define( 'MSLS_PLUGIN_VERSION', '2.9.4' );
 	define( 'MSLS_PLUGIN_PATH', plugin_basename( __FILE__ ) );
 	define( 'MSLS_PLUGIN__FILE__', __FILE__ );
 

bin/flags-svg.php

@@ -30,10 +30,10 @@
 $content    = file_get_contents( 'build/translations.json' );
 $json       = json_decode( $content );
 $glob       = glob( 'css-flags/flags/4x3/*.svg' );
-$exceptions = [
+$exceptions = array(
 	'ca'             => 'es-ca',
 	'eo'             => 'eu',
-	'cy'             => 'gb-ls',
+	'cy'             => 'gb-wls',
 	'gd'             => 'gb-sct',
 	'af'             => 'za',
 	'el'             => 'gr',
@@ -81,9 +81,9 @@
 	'de_CH_informal' => 'ch',
 	'de_DE_formal'   => 'de',
 	'nl_NL_formal'   => 'nl',
-];
+);
 
-$icons = $not_found = [];
+$icons = $not_found = array();
 
 echo '<?php', PHP_EOL, PHP_EOL;
 
@@ -121,9 +121,12 @@
 if ( $count > 0 ) {
 	echo '/**', PHP_EOL, " * {$count} unused icons in css-flags/flags/4x3/", PHP_EOL, ' * ', PHP_EOL;
 
-	array_walk( $glob, function ( &$item ) {
-		$item = substr( $item, 6 );
-	} );
+	array_walk(
+		$glob,
+		function ( &$item ) {
+			$item = substr( $item, 6 );
+		}
+	);
 
 	foreach ( array_chunk( $glob, 15 ) as $flags ) {
 		echo ' * ', implode( ', ', $flags ), PHP_EOL;