Merge pull request #246 from lloc/wordpress-63

New version
lloc · Sep 21, 2023 · 9cf4671 · 9cf4671
2 parents b1def91 + f3be57f
commit 9cf4671
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 38 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,8 @@
+## 2.5.11
+
+* CodeSniffer installed for compatibility check with PHP 8.1
+* CSS/SVG Flags refreshed
+
 ## 2.5.10
 
 * WordPress 6.3 tested

diff --git a/MultisiteLanguageSwitcher.php b/MultisiteLanguageSwitcher.php
@@ -7,7 +7,7 @@
  * @wordpress-plugin
  *
  * Plugin Name: Multisite Language Switcher
- * Version: 2.5.10
+ * Version: 2.5.11
  * 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 <re@lloc.de>
  */
 if ( ! defined( 'MSLS_PLUGIN_VERSION' ) ) {
-	define( 'MSLS_PLUGIN_VERSION', '2.5.10' );
+	define( 'MSLS_PLUGIN_VERSION', '2.5.11' );
 	define( 'MSLS_PLUGIN_PATH', plugin_basename( __FILE__ ) );
 	define( 'MSLS_PLUGIN__FILE__', __FILE__ );
 

diff --git a/build/translations.json b/build/translations.json
diff --git a/composer.json b/composer.json
@@ -14,7 +14,9 @@
     "phpstan/phpstan": "^1.8",
     "szepeviktor/phpstan-wordpress": "^1.1",
     "phpstan/extension-installer": "^1.1",
-    "antecedent/patchwork": "~2.1.19"
+    "antecedent/patchwork": "~2.1.19",
+    "squizlabs/php_codesniffer": "^3.7",
+    "phpcompatibility/php-compatibility": "^9.3"
   },
   "autoload": {
     "psr-4": {
@@ -30,6 +32,7 @@
     "test": "vendor/bin/phpunit",
     "coverage": "php -d xdebug.mode=coverage vendor/bin/phpunit --coverage-html coverage",
     "analyze": "vendor/bin/phpstan analyze",
+    "php81": "phpcs -p ./*.php includes/ --standard=vendor/phpcompatibility/php-compatibility/PHPCompatibility --runtime-set testVersion 8.1",
     "prepare": "wget -O build/translations.json http://api.wordpress.org/translations/core/1.0/",
     "flags-png": "php bin/flags-png.php > flags/flags.php",
     "flags-svg": "php bin/flags-svg.php > css/flags.php"

diff --git a/css/flags.php b/css/flags.php
@@ -31,39 +31,39 @@
     'cs_CZ' => 'flag-icon-cz',
     'cy' => 'flag-icon-gb-ls',
     'da_DK' => 'flag-icon-dk',
-    'de_DE' => 'flag-icon-de',
-    'de_DE_formal' => 'flag-icon-de',
     'de_CH' => 'flag-icon-ch',
     'de_AT' => 'flag-icon-at',
     'de_CH_informal' => 'flag-icon-ch',
+    'de_DE_formal' => 'flag-icon-de',
+    'de_DE' => 'flag-icon-de',
     'dzo' => 'flag-icon-bt',
     'el' => 'flag-icon-gr',
-    'en_NZ' => 'flag-icon-nz',
-    'en_ZA' => 'flag-icon-za',
-    'en_GB' => 'flag-icon-gb',
     'en_CA' => 'flag-icon-ca',
+    'en_GB' => 'flag-icon-gb',
     'en_AU' => 'flag-icon-au',
+    'en_NZ' => 'flag-icon-nz',
+    'en_ZA' => 'flag-icon-za',
     'eo' => 'flag-icon-eu',
-    'es_VE' => 'flag-icon-ve',
+    'es_AR' => 'flag-icon-ar',
     'es_ES' => 'flag-icon-es',
-    'es_CO' => 'flag-icon-co',
+    'es_VE' => 'flag-icon-ve',
+    'es_MX' => 'flag-icon-mx',
     'es_EC' => 'flag-icon-ec',
-    'es_DO' => 'flag-icon-do',
+    'es_CO' => 'flag-icon-co',
     'es_PE' => 'flag-icon-pe',
-    'es_UY' => 'flag-icon-uy',
+    'es_DO' => 'flag-icon-do',
     'es_CL' => 'flag-icon-cl',
+    'es_UY' => 'flag-icon-uy',
     'es_PR' => 'flag-icon-pr',
-    'es_GT' => 'flag-icon-gt',
     'es_CR' => 'flag-icon-cr',
-    'es_AR' => 'flag-icon-ar',
-    'es_MX' => 'flag-icon-mx',
+    'es_GT' => 'flag-icon-gt',
     'et' => 'flag-icon-ee',
     'eu' => 'flag-icon-es',
     'fa_IR' => 'flag-icon-ir',
     'fa_AF' => 'flag-icon-af',
     'fi' => 'flag-icon-fi',
-    'fr_CA' => 'flag-icon-ca',
     'fr_FR' => 'flag-icon-fr',
+    'fr_CA' => 'flag-icon-ca',
     'fr_BE' => 'flag-icon-be',
     'fur' => 'flag-icon-it',
     'gd' => 'flag-icon-gb-sct',
@@ -97,18 +97,18 @@
     'my_MM' => 'flag-icon-mm',
     'nb_NO' => 'flag-icon-no',
     'ne_NP' => 'flag-icon-np',
+    'nl_BE' => 'flag-icon-be',
     'nl_NL_formal' => 'flag-icon-nl',
     'nl_NL' => 'flag-icon-nl',
-    'nl_BE' => 'flag-icon-be',
     'nn_NO' => 'flag-icon-no',
     'oci' => 'flag-icon-es-ca',
     'pa_IN' => 'flag-icon-in',
     'pl_PL' => 'flag-icon-pl',
     'ps' => 'flag-icon-af',
-    'pt_BR' => 'flag-icon-br',
     'pt_PT' => 'flag-icon-pt',
-    'pt_AO' => 'flag-icon-ao',
     'pt_PT_ao90' => 'flag-icon-90',
+    'pt_BR' => 'flag-icon-br',
+    'pt_AO' => 'flag-icon-ao',
     'ro_RO' => 'flag-icon-ro',
     'ru_RU' => 'flag-icon-ru',
     'sah' => 'flag-icon-ru',

diff --git a/flags/flags.php b/flags/flags.php
@@ -31,39 +31,39 @@
     'cs_CZ' => 'cz.png',
     'cy' => 'wales.png',
     'da_DK' => 'dk.png',
-    'de_DE' => 'de.png',
-    'de_DE_formal' => 'de.png',
     'de_CH' => 'ch.png',
     'de_AT' => 'at.png',
     'de_CH_informal' => 'ch.png',
+    'de_DE_formal' => 'de.png',
+    'de_DE' => 'de.png',
     'dzo' => 'bt.png',
     'el' => 'gr.png',
-    'en_NZ' => 'nz.png',
-    'en_ZA' => 'za.png',
-    'en_GB' => 'gb.png',
     'en_CA' => 'ca.png',
+    'en_GB' => 'gb.png',
     'en_AU' => 'au.png',
+    'en_NZ' => 'nz.png',
+    'en_ZA' => 'za.png',
     'eo' => 'europeanunion.png',
-    'es_VE' => 've.png',
+    'es_AR' => 'ar.png',
     'es_ES' => 'es.png',
-    'es_CO' => 'co.png',
+    'es_VE' => 've.png',
+    'es_MX' => 'mx.png',
     'es_EC' => 'ec.png',
-    'es_DO' => 'do.png',
+    'es_CO' => 'co.png',
     'es_PE' => 'pe.png',
-    'es_UY' => 'uy.png',
+    'es_DO' => 'do.png',
     'es_CL' => 'cl.png',
+    'es_UY' => 'uy.png',
     'es_PR' => 'pr.png',
-    'es_GT' => 'gt.png',
     'es_CR' => 'cr.png',
-    'es_AR' => 'ar.png',
-    'es_MX' => 'mx.png',
+    'es_GT' => 'gt.png',
     'et' => 'ee.png',
     'eu' => 'es.png',
     'fa_IR' => 'ir.png',
     'fa_AF' => 'af.png',
     'fi' => 'fi.png',
-    'fr_CA' => 'ca.png',
     'fr_FR' => 'fr.png',
+    'fr_CA' => 'ca.png',
     'fr_BE' => 'be.png',
     'fur' => 'it.png',
     'gd' => 'scotland.png',
@@ -97,18 +97,18 @@
     'my_MM' => 'mm.png',
     'nb_NO' => 'no.png',
     'ne_NP' => 'np.png',
+    'nl_BE' => 'be.png',
     'nl_NL_formal' => 'nl.png',
     'nl_NL' => 'nl.png',
-    'nl_BE' => 'be.png',
     'nn_NO' => 'no.png',
     'oci' => 'catalonia.png',
     'pa_IN' => 'in.png',
     'pl_PL' => 'pl.png',
     'ps' => 'af.png',
-    'pt_BR' => 'br.png',
     'pt_PT' => 'pt.png',
-    'pt_AO' => 'ao.png',
     'pt_PT_ao90' => '90.png',
+    'pt_BR' => 'br.png',
+    'pt_AO' => 'ao.png',
     'ro_RO' => 'ro.png',
     'ru_RU' => 'ru.png',
     'sah' => 'ru.png',

diff --git a/readme.txt b/readme.txt
@@ -4,9 +4,9 @@ Contributors: realloc, lucatume
 Donate link: https://www.greenpeace.org/international/
 Tags: multilingual, multisite, language, switcher, localization
 Requires at least: 4.5.0
-Tested up to: 6.2
+Tested up to: 6.3
 Requires PHP: 7.1
-Stable tag: 2.5.10
+Stable tag: 2.5.11
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html