PHPStand reported issues addressed

Author: lloc

.distignore

@@ -5,7 +5,6 @@
 /build
 /diagrams
 /docs
-/githooks
 /legacy-tests
 /node_modules
 /src

MultisiteLanguageSwitcher.php

@@ -152,6 +152,15 @@ function msls_options(): \lloc\Msls\MslsOptions {
 		return \lloc\Msls\MslsOptions::instance();
 	}
 
+	/**
+	 * Gets the MslsOutput instance
+	 *
+	 * @return \lloc\Msls\MslsOutput
+	 */
+	function msls_output(): \lloc\Msls\MslsOutput {
+		echo \lloc\Msls\MslsOutput::create();
+	}
+
 	/**
 	 * Retrieves the MslsOptionsPost instance.
 	 *
@@ -193,9 +202,5 @@ function msls_get_query(): ?\lloc\Msls\MslsOptionsQuery {
 		return \lloc\Msls\MslsOptionsQuery::create();
 	}
 
-	function msls_output( $attr = array() ) {
-		echo get_the_msls( $attr );
-	}
-
 	lloc\Msls\MslsPlugin::init();
 }

githooks/pre-commit renamed to bin/githooks/pre-commit

@@ -45,8 +45,8 @@
     "diagram:class": "vendor/bin/php-class-diagram --php8 includes > diagrams/msls-class.puml",
     "diagram:package": "vendor/bin/php-class-diagram --package-diagram --php8 includes > diagrams/msls-package.puml",
     "githooks": [
-      "if [ -e ./githooks/pre-commit ]; then cp ./githooks/pre-commit ./.git/hooks/; fi",
-      "if [ -e ./.git/hooks/pre-commit ]; then chmod 0755 ./.git/hooks/pre-commit; fi"
+      "if [ -e bin/githooks/pre-commit ]; then cp bin/githooks/pre-commit ./.git/hooks/; fi",
+      "if [ -e .git/hooks/pre-commit ]; then chmod 0755 .git/hooks/pre-commit; fi"
     ],
     "post-install-cmd": [
       "@githooks"

composer.json

@@ -14,42 +14,35 @@ class MslsBlogCollection extends MslsRegistryInstance {
 	 *
 	 * @var int
 	 */
-	private $current_blog_id;
+	private int $current_blog_id;
 
 	/**
 	 * True if the current blog should be in the output
 	 *
 	 * @var bool
 	 */
-	private $current_blog_output;
+	private bool $current_blog_output;
 
 	/**
 	 * Collection of MslsBlog-objects
 	 *
 	 * @var MslsBlog[]
 	 */
-	private $objects = array();
+	private array $objects = array();
 
 	/**
 	 * Order output by language or description
 	 *
 	 * @var string
 	 */
-	private $objects_order;
+	private string $objects_order;
 
 	/**
 	 * Active plugins in the whole network
 	 *
-	 * @var array
+	 * @var string[]
 	 */
-	private $active_plugins;
-
-	/**
-	 * Container for hreflang-mapping
-	 *
-	 * @var array
-	 */
-	private $hreflangmap = array();
+	private ?array $active_plugins = null;
 
 	/**
 	 * Constructor
@@ -130,7 +123,7 @@ public static function get_configured_blog_description( int $blog_id, $descripti
 	 *
 	 * @param MslsOptions $options
 	 *
-	 * @return array
+	 * @return object[]|\stdClass[]
 	 */
 	public function get_blogs_of_reference_user( MslsOptions $options ) {
 		$reference_user = $options->has_value( 'reference_user' ) ? $options->reference_user : current(
@@ -254,7 +247,7 @@ public function get_object( int $blog_id ): ?MslsBlog {
 	 * @return bool
 	 */
 	public function is_plugin_active( $blog_id ) {
-		if ( ! is_array( $this->active_plugins ) ) {
+		if ( is_null( $this->active_plugins ) ) {
 			$this->active_plugins = get_site_option( 'active_sitewide_plugins', array() );
 		}
 
@@ -271,7 +264,7 @@ public function is_plugin_active( $blog_id ) {
 	/**
 	 * Gets only blogs where the plugin is active
 	 *
-	 * @return array
+	 * @return MslsBlog[]
 	 */
 	public function get_plugin_active_blogs() {
 		$arr = array();
@@ -317,7 +310,7 @@ public function get_filtered( bool $filter = false ): array {
 	 * @param string     $fields
 	 * @param int|string $number
 	 *
-	 * @return array
+	 * @return array<string, int>
 	 */
 	public function get_users( $fields = 'all', $number = '' ) {
 		$args = array(

includes/MslsBlogCollection.php

@@ -66,6 +66,10 @@ public function filter_string( $pref = '<p id="msls">', $post = '</p>' ) {
 		return ! empty( $output ) ? $pref . $output . $post : '';
 	}
 
+	/**
+	 * @param string[] $links
+	 * @return string|null
+	 */
 	public function format_available_languages( array $links ): ?string {
 		if ( empty( $links ) ) {
 			return null;

includes/MslsContentFilter.php

@@ -14,14 +14,14 @@ abstract class MslsContentTypes extends MslsRegistryInstance {
 	 *
 	 * @var string
 	 */
-	protected $request;
+	protected string $request;
 
 	/**
 	 * Types
 	 *
-	 * @var array
+	 * @var string[]
 	 */
-	protected $types = array();
+	protected array $types = array();
 
 	/**
 	 * Factory method
@@ -69,7 +69,7 @@ public function acl_request() {
 	/**
 	 * Getter
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	abstract public static function get(): array;
 

includes/MslsContentTypes.php

@@ -32,11 +32,11 @@ public static function init(): void {
 	/**
 	 * Table header
 	 *
-	 * @param array $columns
+	 * @param string[] $columns
 	 *
-	 * @return array
+	 * @return string[]
 	 */
-	public function th( $columns ) {
+	public function th( array $columns ) {
 		$blogs = $this->collection->get();
 		if ( $blogs ) {
 			$html = '';

includes/MslsCustomColumn.php

@@ -36,7 +36,7 @@ public static function init(): void {
 	 * @param string $column_name
 	 * @param int    $item_id
 	 */
-	public function column_default( $deprecated, $column_name, $item_id ) {
+	public function column_default( $deprecated, $column_name, $item_id ): void {
 		$this->td( $column_name, $item_id );
 	}
 

includes/MslsCustomColumnTaxonomy.php

@@ -12,9 +12,7 @@
 class MslsGetSet extends MslsRegistryInstance {
 
 	/**
-	 * Generic container for all properties of an instance
-	 *
-	 * @var array $arr
+	 * @var array<string, mixed>
 	 */
 	protected $arr = array();
 
@@ -110,9 +108,9 @@ public function is_empty() {
 	/**
 	 * Gets the complete properties-container as an array.
 	 *
-	 * @return array
+	 * @return array<string, mixed>
 	 */
-	public function get_arr() {
+	public function get_arr(): array {
 		return $this->arr;
 	}
 }