PHP-DI added

Author: lloc

MultisiteLanguageSwitcher.php

@@ -35,10 +35,6 @@
 	exit;
 }
 
-if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
-	require __DIR__ . '/vendor/autoload.php';
-}
-
 /**
  * MultisiteLanguageSwitcher
  *
@@ -49,10 +45,23 @@
 	define( 'MSLS_PLUGIN_PATH', plugin_basename( __FILE__ ) );
 	define( 'MSLS_PLUGIN__FILE__', __FILE__ );
 
-	require_once __DIR__ . '/includes/aliases.php';
-	require_once __DIR__ . '/includes/deprectated.php';
-	require_once __DIR__ . '/includes/api.php';
+	if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
+		require __DIR__ . '/vendor/autoload.php';
+	}
+
+	add_action(
+		'plugins_loaded',
+		function () {
+			require_once __DIR__ . '/includes/aliases.php';
+			require_once __DIR__ . '/includes/deprectated.php';
+			require_once __DIR__ . '/includes/api.php';
+
+			$builder = new DI\ContainerBuilder();
+			$builder->addDefinitions( require __DIR__ . '/config.php' );
+			$builder->build();
 
-	lloc\Msls\Plugin::init();
-	lloc\Msls\Cli\Cli::init();
+			lloc\Msls\Plugin::init();
+			lloc\Msls\Cli\Cli::init();
+		}
+	);
 }

composer.json

@@ -7,6 +7,7 @@
   "require": {
     "php": ">=7.4",
     "composer/installers": "~2.3.0",
+    "php-di/php-di": "^7.0",
     "ext-json": "*"
   },
   "require-dev": {

config.php

@@ -0,0 +1,3 @@
+<?php declare( strict_types=1 );
+
+return array();

includes/Plugin.php

@@ -36,15 +36,11 @@ class Plugin {
 
 	/**
 	 * Injected Options object
-	 *
-	 * @var Options
 	 */
-	protected $options;
+	protected Options $options;
 
 	/**
 	 * MslsPlugin constructor.
-	 *
-	 * @param Options $options
 	 */
 	public function __construct( Options $options ) {
 		$this->options = $options;
@@ -56,6 +52,8 @@ public function __construct( Options $options ) {
 	public static function init(): void {
 		$obj = new self( msls_options() );
 
+		add_action( 'init', array( $obj, 'init_i18n_support' ) );
+
 		register_activation_hook( self::file(), array( __CLASS__, 'activate' ) );
 
 		if ( function_exists( 'is_multisite' ) && is_multisite() ) {
@@ -196,6 +194,16 @@ public static function path(): string {
 		return defined( 'MSLS_PLUGIN_PATH' ) ? constant( 'MSLS_PLUGIN_PATH' ) : '';
 	}
 
+	/**
+	 * Loads the translation files for the plugin from the bundled /languages/ directory.
+	 *
+	 * Required because the plugin ships its own .mo files; WordPress only auto-loads
+	 * translations served from wordpress.org's language packs.
+	 */
+	public function init_i18n_support(): void {
+		load_plugin_textdomain( 'multisite-language-switcher', false, self::dirname( '/languages/' ) );
+	}
+
 	/**
 	 * Message handler
 	 *

readme.txt

@@ -4,7 +4,7 @@ Contributors: realloc, lucatume
 Donate link: https://www.greenpeace.org/international/
 Tags: multilingual, multisite, language, switcher, localization
 Requires at least: 6.1
-Tested up to: 6.9
+Tested up to: 7.0
 Requires PHP: 7.4
 Stable tag: 2.10.1
 License: GPLv2 or later