Unsafe use of new static solved

Author: lloc

MultisiteLanguageSwitcher.php

@@ -158,7 +158,7 @@ function msls_options(): \lloc\Msls\MslsOptions {
 	 * @return \lloc\Msls\MslsOutput
 	 */
 	function msls_output(): \lloc\Msls\MslsOutput {
-		echo \lloc\Msls\MslsOutput::create();
+		return \lloc\Msls\MslsOutput::create();
 	}
 
 	/**

includes/Map/HrefLang.php

@@ -6,20 +6,21 @@
 
 /**
  * Class HrefLang
+ *
  * @package lloc\Msls\Map
  */
 class HrefLang {
 
 	/**
-	 * @var array
+	 * @var array<string, <array<string>>>
 	 */
-	protected $map = [];
+	protected $map = array();
 
 	/**
 	 * @param MslsBlogCollection $blogs
 	 */
 	public function __construct( MslsBlogCollection $blogs ) {
-		$map = [];
+		$map = array();
 		foreach ( $blogs->get_objects() as $blog ) {
 			$map[ $blog->get_alpha2() ][] = $blog->get_language();
 		}
@@ -65,5 +66,4 @@ public function get( string $language ): string {
 		 */
 		return (string) apply_filters( 'msls_head_hreflang', $language );
 	}
-
-}
+}

includes/MslsAdmin.php

@@ -24,7 +24,7 @@
  *
  * @package Msls
  */
-class MslsAdmin extends MslsMain {
+final class MslsAdmin extends MslsMain {
 
 	public const MAX_REFERENCE_USERS = 100;
 
@@ -34,7 +34,7 @@ class MslsAdmin extends MslsMain {
 	public static function init(): void {
 		$obj = MslsRegistry::get_object( __CLASS__ );
 		if ( ! $obj ) {
-			$obj = new static( msls_options(), msls_blog_collection() );
+			$obj = new self( msls_options(), msls_blog_collection() );
 
 			MslsRegistry::set_object( __CLASS__, $obj );
 

includes/MslsCustomColumn.php

@@ -16,16 +16,21 @@ class MslsCustomColumn extends MslsMain {
 	public static function init(): void {
 		$options    = msls_options();
 		$collection = msls_blog_collection();
-		$obj        = new static( $options, $collection );
 
-		if ( ! $options->is_excluded() ) {
-			$post_type = MslsPostType::instance()->get_request();
+		( new static( $options, $collection ) )->add_hooks();
+	}
 
-			if ( ! empty( $post_type ) ) {
-				add_filter( "manage_{$post_type}_posts_columns", array( $obj, 'th' ) );
-				add_action( "manage_{$post_type}_posts_custom_column", array( $obj, 'td' ), 10, 2 );
-				add_action( 'trashed_post', array( $obj, 'delete' ) );
-			}
+	protected function add_hooks(): void {
+		if ( $this->options->is_excluded() ) {
+			return;
+		}
+
+		$post_type = MslsPostType::instance()->get_request();
+
+		if ( ! empty( $post_type ) ) {
+			add_filter( "manage_{$post_type}_posts_columns", array( $this, 'th' ) );
+			add_action( "manage_{$post_type}_posts_custom_column", array( $this, 'td' ), 10, 2 );
+			add_action( 'trashed_post', array( $this, 'delete' ) );
 		}
 	}
 

includes/MslsCustomColumnTaxonomy.php

@@ -8,24 +8,19 @@
  *
  * @package Msls
  */
-class MslsCustomColumnTaxonomy extends MslsCustomColumn {
+final class MslsCustomColumnTaxonomy extends MslsCustomColumn {
 
-	/**
-	 * @codeCoverageIgnore
-	 */
-	public static function init(): void {
-		$options    = msls_options();
-		$collection = msls_blog_collection();
-		$obj        = new static( $options, $collection );
+	protected function add_hooks(): void {
+		if ( $this->options->is_excluded() ) {
+			return;
+		}
 
-		if ( ! $options->is_excluded() ) {
-			$taxonomy = MslsTaxonomy::instance()->get_request();
+		$taxonomy = MslsTaxonomy::instance()->get_request();
 
-			if ( ! empty( $taxonomy ) ) {
-				add_filter( "manage_edit-{$taxonomy}_columns", array( $obj, 'th' ) );
-				add_action( "manage_{$taxonomy}_custom_column", array( $obj, 'column_default' ), - 100, 3 );
-				add_action( "delete_{$taxonomy}", array( $obj, 'delete' ) );
-			}
+		if ( ! empty( $taxonomy ) ) {
+			add_filter( "manage_edit-{$taxonomy}_columns", array( $this, 'th' ) );
+			add_action( "manage_{$taxonomy}_custom_column", array( $this, 'column_default' ), - 100, 3 );
+			add_action( "delete_{$taxonomy}", array( $this, 'delete' ) );
 		}
 	}
 

includes/MslsCustomFilter.php

@@ -3,23 +3,22 @@
 namespace lloc\Msls;
 
 use lloc\Msls\Component\Input\Select;
-use lloc\Msls\Component\InputInterface;
 use lloc\Msls\Query\TranslatedPostIdQuery;
 
 /**
  * Adding custom filter to posts/pages table.
  *
  * @package Msls
  */
-class MslsCustomFilter extends MslsMain {
+final class MslsCustomFilter extends MslsMain {
 
 	/**
 	 * @codeCoverageIgnore
 	 */
 	public static function init(): void {
 		$options    = msls_options();
 		$collection = msls_blog_collection();
-		$obj        = new static( $options, $collection );
+		$obj        = new self( $options, $collection );
 
 		if ( ! $options->is_excluded() ) {
 			$post_type = MslsPostType::instance()->get_request();

includes/MslsMain.php

@@ -31,7 +31,7 @@ class MslsMain {
 	 * @param MslsOptions        $options
 	 * @param MslsBlogCollection $collection
 	 */
-	public function __construct( MslsOptions $options, MslsBlogCollection $collection ) {
+	final public function __construct( MslsOptions $options, MslsBlogCollection $collection ) {
 		$this->options    = $options;
 		$this->collection = $collection;
 	}

includes/MslsMetaBox.php

@@ -10,7 +10,7 @@
  *
  * @package Msls
  */
-class MslsMetaBox extends MslsMain {
+final class MslsMetaBox extends MslsMain {
 
 	/**
 	 * Suggest
@@ -94,7 +94,7 @@ public static function get_suggested_fields( MslsJson $json, array $args ): Msls
 	 */
 	public static function init(): void {
 		$options = msls_options();
-		$obj     = new static( $options, msls_blog_collection() );
+		$obj     = new self( $options, msls_blog_collection() );
 
 		if ( ! $options->is_excluded() ) {
 			add_action( 'add_meta_boxes', array( $obj, 'add' ) );