Issues resolved

Author: lloc

includes/Component/Icon/IconLabel.php

@@ -3,7 +3,6 @@
 namespace lloc\Msls\Component\Icon;
 
 use lloc\Msls\Component\Icon;
-use lloc\Msls\MslsPlugin;
 
 /**
  * Class IconLabel

includes/ContentImport/ImportCoordinates.php

@@ -26,7 +26,7 @@ class ImportCoordinates {
 	public $dest_post_id;
 
 	/**
-	 * @var \WP_Post
+	 * @var ?\WP_Post
 	 */
 	public $source_post;
 

includes/ContentImport/Importers/Map.php

@@ -16,7 +16,7 @@ class Map extends MslsRegistryInstance {
 	public function make( ImportCoordinates $import_coordinates ) {
 		$importers = array_map(
 			function ( $factory ) use ( $import_coordinates ) {
-				/** @var ImportersFactory $factory */
+				/** @var ImportersBaseFactory $factory */
 				return $factory->make( $import_coordinates );
 			},
 			$this->factories()

includes/MslsAdmin.php

@@ -86,8 +86,7 @@ public function get_options_page_link(): string {
 	 */
 	public function __call( $method, $args ) {
 		$parts = explode( '_', $method, 2 );
-
-		if ( is_array( $parts ) && 'rewrite' === $parts[0] ) {
+		if ( count( $parts ) > 0 && 'rewrite' === $parts[0] ) {
 			$this->render_rewrite( $parts[1] );
 			return;
 		}

includes/MslsOptions.php

@@ -370,7 +370,7 @@ public function get_available_languages(): array {
 	/**
 	 * The 'blog'-slug-problem :/
 	 *
-	 * @param string      $url
+	 * @param mixed       $url
 	 * @param MslsOptions $options
 	 *
 	 * @return string

includes/MslsOptionsTax.php

@@ -33,23 +33,33 @@ public static function create( $id = 0 ): OptionsTaxInterface {
 		switch ( $req ) {
 			case 'category':
 				$options = new MslsOptionsTaxTermCategory( $id );
+				add_filter( 'msls_get_postlink', array( $options, 'check_base' ), 9, 2 );
 				break;
 			case 'post_tag':
 				$options = new MslsOptionsTaxTerm( $id );
+				add_filter( 'msls_get_postlink', array( $options, 'check_base' ), 9, 2 );
 				break;
 			default:
-				$options = new MslsOptionsTax( $id );
+				global $wp_rewrite;
+
+				$options             = new MslsOptionsTax( $id );
+				$options->with_front = ! empty( $wp_rewrite->extra_permastructs[ $options->get_tax_query() ]['with_front'] );
 		}
 
-		if ( method_exists( $options, 'check_base' ) ) {
-			add_filter( 'msls_get_postlink', array( $options, 'check_base' ), 9, 2 );
-		} else {
-			global $wp_rewrite;
+		return $options;
+	}
 
-			$options->with_front = ! empty( $wp_rewrite->extra_permastructs[ $options->get_tax_query() ]['with_front'] );
+	/**
+	 * @param int $id
+	 *
+	 * @return string
+	 */
+	public function get_content_type( int $id ): string {
+		if ( is_admin() ) {
+			return msls_content_types()->acl_request();
 		}
 
-		return $options;
+		return ( is_category() ? 'category' : is_tag( $id ) ) ? 'post_tag' : '';
 	}
 
 	/**

includes/MslsRequest.php

@@ -17,29 +17,34 @@ public static function get_config( string $name ): array {
 		return $config;
 	}
 
-	public static function has_var( string $name, ?int $input_type = null ): bool {
+	public static function has_var( string $var_name, ?int $input_type = null ): bool {
 		if ( null === $input_type ) {
 			try {
-				list( $input_type, ) = self::get_config( $name );
+				list( $input_type, ) = self::get_config( $var_name );
 			} catch ( \InvalidArgumentException $e ) {
 				return false;
 			}
 		}
 
-		return filter_has_var( $input_type, $name );
+		return filter_has_var( $input_type, $var_name );
 	}
 
 	/**
 	 * @return mixed
 	 */
-	public static function get_var( string $name, ?int $input_type = null ) {
+	public static function get_var( string $var_name, ?int $input_type = null ) {
 		try {
-			list($type, $filter) = self::get_config( $name );
+			list($type, $filter) = self::get_config( $var_name );
 		} catch ( \InvalidArgumentException $e ) {
 			return null;
 		}
 
-		return filter_input( $input_type ?? $type, $name, $filter );
+		$type = $input_type ?? $type;
+		if ( in_array( $type, array( INPUT_POST, INPUT_GET, INPUT_COOKIE, INPUT_ENV, INPUT_SERVER ), true ) ) {
+			return filter_input( $type, $var_name, $filter );
+		}
+
+		return null;
 	}
 
 	/**

includes/MslsSqlCacher.php

@@ -8,7 +8,7 @@
  * @example https://gist.githubusercontent.com/lloc/2c232cef3f910acf692f/raw/91e5fe9ada922a82a32b83eaabad1e2a2ee50338/MslsSqlCacher.php
  *
  * @method mixed get_var( string $sql )
- * @method array get_results( string $sql )
+ * @method mixed[] get_results( string $sql )
  * @method string prepare( string $sql, mixed $a, $b = '', $c = '' )
  * @method mixed query( string $sql )
  * @property string $posts

phpstan.neon.dist

@@ -1,6 +1,7 @@
 parameters:
     level: 6
     inferPrivatePropertyTypeFromConstructor: true
+    treatPhpDocTypesAsCertain: false
     paths:
         - MultisiteLanguageSwitcher.php
         - includes