MslsCustomFilter class tested

includes/MslsBlogCollection.php

@@ -97,6 +97,7 @@ public function __construct() {
 					$this->objects[ $blog->userblog_id ] = new MslsBlog( $blog, $description );
 				}
 			}
+
 			uasort( $this->objects, array( MslsBlog::class, $this->objects_order ) );
 		}
 	}
@@ -109,7 +110,7 @@ public function __construct() {
 	 *
 	 * @return string|bool
 	 */
-	public static function get_configured_blog_description( $blog_id, $description = false ) {
+	public static function get_configured_blog_description( int $blog_id, $description = false ) {
 		if ( $description ) {
 			return $description;
 		}
@@ -138,7 +139,8 @@ public function get_blogs_of_reference_user( MslsOptions $options ) {
 				1
 			)
 		);
-		$blogs          = get_blogs_of_user( $reference_user );
+
+		$blogs = get_blogs_of_user( $reference_user );
 
 		/**
 		 * @todo Check if this is still useful
@@ -229,10 +231,21 @@ public function get_current_blog() {
 	 *
 	 * @return MslsBlog[]
 	 */
-	public function get_objects() {
+	public function get_objects(): array {
 		return apply_filters( 'msls_blog_collection_get_objects', $this->objects );
 	}
 
+	/**
+	 * Gets a specific blog-object
+	 *
+	 * @param int $blog_id
+	 *
+	 * @return ?MslsBlog
+	 */
+	public function get_object( int $blog_id ): ?MslsBlog {
+		return $this->get_objects()[ $blog_id ] ?? null;
+	}
+
 	/**
 	 * Is plugin active in the blog with that blog_id
 	 *

includes/MslsContentTypes.php

@@ -1,29 +1,27 @@
 <?php
-/**
- * MslsContentTypes
- * @author Dennis Ploetner <[email protected]>
- * @since 0.9.8
- */
 
 namespace lloc\Msls;
 
 /**
  * Supported content types
+ *
  * @package Msls
  */
 abstract class MslsContentTypes extends MslsRegistryInstance {
 
 	/**
 	 * Request
+	 *
 	 * @var string
 	 */
 	protected $request;
 
 	/**
 	 * Types
+	 *
 	 * @var array
 	 */
-	protected $types = [];
+	protected $types = array();
 
 	/**
 	 * Factory method
@@ -33,13 +31,14 @@ abstract class MslsContentTypes extends MslsRegistryInstance {
 	 * @return MslsContentTypes
 	 */
 	public static function create() {
-		$_request = MslsPlugin::get_superglobals( [ 'taxonomy' ] );
+		$_request = MslsPlugin::get_superglobals( array( 'taxonomy' ) );
 
 		return '' != $_request['taxonomy'] ? MslsTaxonomy::instance() : MslsPostType::instance();
 	}
 
 	/**
 	 * Check for post_type
+	 *
 	 * @return bool
 	 */
 	public function is_post_type() {
@@ -48,6 +47,7 @@ public function is_post_type() {
 
 	/**
 	 * Check for taxonomy
+	 *
 	 * @return bool
 	 */
 	public function is_taxonomy() {
@@ -68,6 +68,7 @@ public function acl_request() {
 
 	/**
 	 * Getter
+	 *
 	 * @return array
 	 */
 	abstract public static function get(): array;
@@ -78,5 +79,4 @@ abstract public static function get(): array;
 	 * @return string
 	 */
 	abstract public function get_request(): string;
-
 }

includes/MslsCustomColumn.php

@@ -1,15 +1,11 @@
 <?php
-/**
- * MslsCustomColumn
- * @author Dennis Ploetner <[email protected]>
- * @since 0.9.8
- */
 
 namespace lloc\Msls;
 
 /**
  * Handling of existing/not existing translations in the backend listings of
  * various post types
+ *
  * @package Msls
  */
 class MslsCustomColumn extends MslsMain {
@@ -30,9 +26,9 @@ public static function init() {
 			$post_type = MslsPostType::instance()->get_request();
 
 			if ( ! empty( $post_type ) ) {
-				add_filter( "manage_{$post_type}_posts_columns", [ $obj, 'th' ] );
-				add_action( "manage_{$post_type}_posts_custom_column", [ $obj, 'td' ], 10, 2 );
-				add_action( 'trashed_post', [ $obj, 'delete' ] );
+				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' ) );
 			}
 		}
 
@@ -53,11 +49,11 @@ public function th( $columns ) {
 			foreach ( $blogs as $blog ) {
 				$language = $blog->get_language();
 
-                $icon_type=  $this->options->admin_display === 'label' ? 'label' : 'flag';
+				$icon_type = $this->options->admin_display === 'label' ? 'label' : 'flag';
 
-                $icon = new MslsAdminIcon( null );
+				$icon = new MslsAdminIcon( null );
 				$icon->set_language( $language );
-                $icon->set_icon_type( $icon_type );
+				$icon->set_icon_type( $icon_type );
 
 				if ( $post_id = get_the_ID() ) {
 					$icon->set_id( $post_id );
@@ -78,7 +74,7 @@ public function th( $columns ) {
 	 * Table body
 	 *
 	 * @param string $column_name
-	 * @param int $item_id
+	 * @param int    $item_id
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -113,5 +109,4 @@ public function td( $column_name, $item_id ) {
 			}
 		}
 	}
-
 }

includes/MslsCustomColumnTaxonomy.php

@@ -1,15 +1,11 @@
 <?php
-/**
- * MslsCustomColumnTaxonomy
- * @author Dennis Ploetner <[email protected]>
- * @since 0.9.8
- */
 
 namespace lloc\Msls;
 
 /**
  * Handling of existing/not existing translations in the backend
  * listings of various taxonomies
+ *
  * @package Msls
  */
 class MslsCustomColumnTaxonomy extends MslsCustomColumn {
@@ -30,9 +26,9 @@ public static function init() {
 			$taxonomy = MslsTaxonomy::instance()->get_request();
 
 			if ( ! empty( $taxonomy ) ) {
-				add_filter( "manage_edit-{$taxonomy}_columns", [ $obj, 'th' ] );
-				add_action( "manage_{$taxonomy}_custom_column", [ $obj, 'column_default' ], - 100, 3 );
-				add_action( "delete_{$taxonomy}", [ $obj, 'delete' ] );
+				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' ) );
 			}
 		}
 
@@ -44,7 +40,7 @@ public static function init() {
 	 *
 	 * @param string $deprecated
 	 * @param string $column_name
-	 * @param int $item_id
+	 * @param int    $item_id
 	 */
 	public function column_default( $deprecated, $column_name, $item_id ) {
 		$this->td( $column_name, $item_id );
@@ -60,5 +56,4 @@ public function column_default( $deprecated, $column_name, $item_id ) {
 	public function delete( $object_id ) {
 		$this->save( $object_id, MslsOptionsTax::class );
 	}
-
 }

includes/MslsCustomFilter.php

@@ -43,7 +43,7 @@ public function add_filter(): void {
 		$id = (
 			filter_has_var( INPUT_GET, 'msls_filter' ) ?
 			filter_input( INPUT_GET, 'msls_filter', FILTER_SANITIZE_NUMBER_INT ) :
-			''
+			'0'
 		);
 
 		$blogs = $this->collection->get();
@@ -54,7 +54,7 @@ public function add_filter(): void {
 				printf(
 					'<option value="%d" %s>%s</option>',
 					$blog->userblog_id,
-					selected( $id, $blog->userblog_id, false ),
+					selected( intval( $id ), $blog->userblog_id, false ),
 					sprintf(
 						__( 'Not translated in the %s-blog', 'multisite-language-switcher' ),
 						$blog->get_description()
@@ -73,18 +73,18 @@ public function add_filter(): void {
 	 * @return bool|\WP_Query
 	 */
 	public function execute_filter( \WP_Query $query ) {
-		$blogs = $this->collection->get();
-
 		if ( ! filter_has_var( INPUT_GET, 'msls_filter' ) ) {
 			return false;
 		}
 
-		$id = filter_input( INPUT_GET, 'msls_filter', FILTER_SANITIZE_NUMBER_INT );
-		if ( isset( $blogs[ $id ] ) ) {
+		$id   = filter_input( INPUT_GET, 'msls_filter', FILTER_SANITIZE_NUMBER_INT );
+		$blog = $this->collection->get_object( intval( $id ) );
+
+		if ( $blog ) {
 			$sql_cache = MslsSqlCacher::create( __CLASS__, __METHOD__ );
 
 			// load post we need to exclude (they already have a translation) from search query
-			$translated_posts = ( new TranslatedPostsQuery( $sql_cache ) )( $blogs[ $id ]->get_language() );
+			$translated_posts = ( new TranslatedPostsQuery( $sql_cache ) )( $blog->get_language() );
 
 			$exclude_ids = array();
 			foreach ( $translated_posts as $post ) {

includes/MslsGetSet.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * MslsGetSet
- *
- * @author Dennis Ploetner <[email protected]>
- * @since 0.9.8
- */
 
 namespace lloc\Msls;
 

includes/MslsJson.php

@@ -1,24 +1,21 @@
 <?php
-/**
- * MslsJson
- * @author Dennis Ploetner <[email protected]>
- * @since 0.9.9
- */
 
 namespace lloc\Msls;
 
 /**
  * Container for an array which will used in JavaScript as object in JSON
+ *
  * @example https://gist.githubusercontent.com/lloc/2c232cef3f910acf692f/raw/1c4f62e1de57ca48f19c37e3a63e7dc311b76b2f/MslsJson.php
  * @package Msls
  */
 class MslsJson {
 
 	/**
 	 * Container
+	 *
 	 * @var array
 	 */
-	protected array $arr = [];
+	protected array $arr = array();
 
 	/** MslsLanguageArray
 	 * Adds a value label pair to the internal class container
@@ -29,10 +26,10 @@ class MslsJson {
 	 * @return MslsJson
 	 */
 	public function add( $value, $label ) {
-		$this->arr[] = [
+		$this->arr[] = array(
 			'value' => intval( $value ),
 			'label' => strval( $label ),
-		];
+		);
 
 		return $this;
 	}
@@ -57,7 +54,7 @@ public static function compare( array $a, array $b ) {
 	public function get(): array {
 		$arr = $this->arr;
 
-		usort( $arr, [ __CLASS__, 'compare' ] );
+		usort( $arr, array( __CLASS__, 'compare' ) );
 
 		return $arr;
 	}
@@ -79,5 +76,4 @@ public function encode(): string {
 	public function __toString() {
 		return $this->encode();
 	}
-
 }

includes/MslsLanguageArray.php

@@ -1,21 +1,18 @@
 <?php
-/**
- * MslsLanguageArray
- * @author Dennis Ploetner <[email protected]>
- * @since 0.9.8
- */
 
 namespace lloc\Msls;
 
 /**
  * Stores the language input from post
+ *
  * @example https://gist.githubusercontent.com/lloc/2c232cef3f910acf692f/raw/c78a78b42cb4c9e97a118523f7497f02b838a2ee/MslsLanguageArray.php
  * @package Msls
  */
 class MslsLanguageArray {
 
 	/**
 	 * Generic container
+	 *
 	 * @var array
 	 */
 	protected $arr;
@@ -25,7 +22,7 @@ class MslsLanguageArray {
 	 *
 	 * @param array $arr
 	 */
-	public function __construct( array $arr = [] ) {
+	public function __construct( array $arr = array() ) {
 		foreach ( $arr as $key => $value ) {
 			$this->set( $key, $value );
 		}
@@ -37,7 +34,7 @@ public function __construct( array $arr = [] ) {
 	 * - $value must be an integer > 0
 	 *
 	 * @param string $key
-	 * @param mixed $value
+	 * @param mixed  $value
 	 *
 	 * @return MslsLanguageArray
 	 */
@@ -77,5 +74,4 @@ public function get_arr( $key = '' ) {
 
 		return $arr;
 	}
-
 }