PHPStan errors addressed

Author: lloc

includes/Component/Input/Select.php

@@ -6,6 +6,8 @@
 
 class Select implements InputInterface {
 
+	const RENDER_FILTER = 'msls_input_select_name';
+
 	/**
 	 * @var string
 	 */
@@ -34,7 +36,7 @@ public function __construct( string $key, array $arr, ?string $selected = null )
 	 * @return string
 	 */
 	public function render(): string {
-		$name = apply_filters( 'msls_input_select_name', 'msls[' . $this->key . ']' );
+		$name = apply_filters( self::RENDER_FILTER, 'msls[' . $this->key . ']' );
 
 		return sprintf( '<select id="%1$s" name="%2$s">%3$s</select>', $this->key, esc_attr( $name ), $this->options->render() );
 	}

includes/Component/InputInterface.php

@@ -4,13 +4,15 @@
 
 /**
  * Interface Input
+ *
  * @package lloc\Msls\Component
  */
 interface InputInterface {
 
+	const INPUT_PREFIX = 'msls_input_';
+
 	/**
 	 * @return string
 	 */
 	public function render(): string;
-
-}
+}

includes/MslsCustomFilter.php

@@ -3,6 +3,7 @@
 namespace lloc\Msls;
 
 use lloc\Msls\Component\Input\Select;
+use lloc\Msls\Component\InputInterface;
 use lloc\Msls\Query\TranslatedPostIdQuery;
 
 /**
@@ -26,7 +27,7 @@ public static function init(): void {
 				add_action( 'restrict_manage_posts', array( $obj, 'add_filter' ) );
 				add_filter( 'parse_query', array( $obj, 'execute_filter' ) );
 				add_filter(
-					'msls_input_select_name',
+					Select::RENDER_FILTER,
 					function () {
 						return MslsFields::FIELD_MSLS_FILTER;
 					}

includes/MslsLanguageArray.php

@@ -11,16 +11,14 @@
 class MslsLanguageArray {
 
 	/**
-	 * Generic container
-	 *
-	 * @var array
+	 * @var array<string, int>
 	 */
-	protected $arr;
+	protected array $arr;
 
 	/**
 	 * Constructor
 	 *
-	 * @param array $arr
+	 * @param array<string, mixed> $arr
 	 */
 	public function __construct( array $arr = array() ) {
 		foreach ( $arr as $key => $value ) {
@@ -64,10 +62,11 @@ public function get_val( $key ) {
 	 *
 	 * @param string $key
 	 *
-	 * @return array
+	 * @return array<string, int>
 	 */
-	public function get_arr( $key = '' ) {
+	public function get_arr( string $key = '' ): array {
 		$arr = $this->arr;
+
 		if ( isset( $arr[ $key ] ) ) {
 			unset( $arr[ $key ] );
 		}

includes/MslsMain.php

@@ -2,6 +2,8 @@
 
 namespace lloc\Msls;
 
+use lloc\Msls\Component\InputInterface;
+
 /**
  * Abstraction for the hook classes
  *
@@ -61,9 +63,9 @@ public function debugger( $message ): void {
 	 *
 	 * @param int $object_id
 	 *
-	 * @return array
+	 * @return array<string, int>
 	 */
-	public function get_input_array( $object_id ) {
+	public function get_input_array( $object_id ): array {
 		$arr = array();
 
 		$current_blog = $this->collection->get_current_blog();
@@ -76,30 +78,16 @@ public function get_input_array( $object_id ) {
 			return $arr;
 		}
 
-		foreach ( $input_post as $k => $v ) {
-			list ( $key, $value ) = $this->get_input_value( $k, $v );
-			if ( $value ) {
-				$arr[ $key ] = $value;
+		$offset = strlen( InputInterface::INPUT_PREFIX );
+		foreach ( $input_post as $key => $value ) {
+			if ( false === strpos( $key, InputInterface::INPUT_PREFIX ) || empty( $value ) ) {
+				continue;
 			}
-		}
-
-		return $arr;
-	}
 
-	/**
-	 * Prepare input key/value-pair
-	 *
-	 * @param $key
-	 * @param $value
-	 *
-	 * @return array
-	 */
-	protected function get_input_value( $key, $value ) {
-		if ( false === strpos( $key, 'msls_input_' ) || empty( $value ) ) {
-			return array( '', 0 );
+			$arr[ substr( $key, $offset ) ] = intval( $value );
 		}
 
-		return array( substr( $key, 11 ), intval( $value ) );
+		return $arr;
 	}
 
 	/**
@@ -137,21 +125,21 @@ public function delete( $object_id ): void {
 	 * Save
 	 *
 	 * @param int    $object_id
-	 * @param string $class
+	 * @param string $class_name
 	 *
 	 * @codeCoverageIgnore
 	 */
-	protected function save( $object_id, $class ): void {
+	protected function save( $object_id, $class_name ): void {
 		if ( has_action( 'msls_main_save' ) ) {
 			/**
 			 * Calls completely customized save-routine
 			 *
 			 * @param int $object_id
-			 * @param string Classname
+			 * @param string $class_name
 			 *
 			 * @since 0.9.9
 			 */
-			do_action( 'msls_main_save', $object_id, $class );
+			do_action( 'msls_main_save', $object_id, $class_name );
 
 			return;
 		}
@@ -164,7 +152,7 @@ protected function save( $object_id, $class ): void {
 
 		$language = $this->collection->get_current_blog()->get_language();
 		$msla     = new MslsLanguageArray( $this->get_input_array( $object_id ) );
-		$options  = new $class( $object_id );
+		$options  = new $class_name( $object_id );
 		$temp     = $options->get_arr();
 
 		if ( 0 != $msla->get_val( $language ) ) {
@@ -180,10 +168,10 @@ protected function save( $object_id, $class ): void {
 			$larr_id  = $msla->get_val( $language );
 
 			if ( 0 != $larr_id ) {
-				$options = new $class( $larr_id );
+				$options = new $class_name( $larr_id );
 				$options->save( $msla->get_arr( $language ) );
 			} elseif ( isset( $temp[ $language ] ) ) {
-				$options = new $class( $temp[ $language ] );
+				$options = new $class_name( $temp[ $language ] );
 				$options->delete();
 			}
 

includes/MslsMetaBox.php

@@ -2,6 +2,7 @@
 
 namespace lloc\Msls;
 
+use lloc\Msls\Component\InputInterface;
 use lloc\Msls\ContentImport\MetaBox as ContentImportMetaBox;
 
 /**
@@ -186,7 +187,7 @@ public function render_select(): void {
 					$args = array(
 						'post_type'         => $type,
 						'selected'          => $mydata->$language,
-						'name'              => 'msls_input_' . $language,
+						'name'              => InputInterface::INPUT_PREFIX . $language,
 						'show_option_none'  => ' ',
 						'option_none_value' => 0,
 						'sort_column'       => 'menu_order, post_title',