Upgrade and first fixes

Author: lloc

MultisiteLanguageSwitcher.php

@@ -208,9 +208,9 @@ function msls_get_post( int $id ): \lloc\Msls\MslsOptionsPost {
 	 * - is_tax
 	 *
 	 * @param int $id
-	 * @return \lloc\Msls\MslsOptionsTax
+	 * @return \lloc\Msls\OptionsTaxInterface
 	 */
-	function msls_get_tax( int $id ): \lloc\Msls\MslsOptionsTax {
+	function msls_get_tax( int $id ): \lloc\Msls\OptionsTaxInterface {
 		return \lloc\Msls\MslsOptionsTax::create( $id );
 	}
 

composer.json

@@ -12,15 +12,15 @@
   "require-dev": {
     "phpunit/phpunit": "^10",
     "brain/monkey": "^2.6",
-    "phpstan/phpstan": "^1.11",
-    "szepeviktor/phpstan-wordpress": "^1.3",
+    "phpstan/phpstan": "^2.1.0",
+    "szepeviktor/phpstan-wordpress": "^2.0.0",
     "phpstan/extension-installer": "^1.3",
     "antecedent/patchwork": "^2.1",
     "squizlabs/php_codesniffer": "^3.9",
     "phpcompatibility/php-compatibility": "^9.3",
     "wp-coding-standards/wpcs": "^3.0",
     "smeghead/php-class-diagram": "^1.3",
-    "phpstan/phpstan-mockery": "^1.1"
+    "phpstan/phpstan-mockery": "^2.0.0"
   },
   "autoload": {
     "psr-4": {

includes/ContentImport/AttachmentPathFinder.php

@@ -93,7 +93,7 @@ public function filter_attachment_url( $url, $attachment_id ) {
 	protected function get_source_post( $attachment_id, $msls_imported ) {
 		$source_post = get_blog_post( $msls_imported['blog'], $msls_imported['post'] );
 
-		if ( empty( $source_post ) || ! $source_post instanceof \WP_Post ) {
+		if ( ! $source_post instanceof \WP_Post ) {
 			delete_post_meta( $attachment_id, self::LINKED );
 
 			return false;

includes/ContentImport/ContentImporter.php

@@ -285,7 +285,7 @@ public function import_content( ImportCoordinates $import_coordinates, array $po
 		 * Returning a non `null` value here will override the creation of the importers map completely
 		 * and use the one returned in the filter.
 		 *
-		 * @param null $importers
+		 * @param ?array $importers
 		 * @param ImportCoordinates $import_coordinates
 		 */
 		$importers = apply_filters( 'msls_content_import_importers', null, $import_coordinates );
@@ -297,7 +297,7 @@ public function import_content( ImportCoordinates $import_coordinates, array $po
 		$this->logger    = $this->logger ?: new ImportLogger( $import_coordinates );
 		$this->relations = $this->relations ?: new Relations( $import_coordinates );
 
-		if ( ! empty( $importers ) && is_array( $importers ) ) {
+		if ( ! empty( $importers ) ) {
 			$source_post_id = $import_coordinates->source_post_id;
 			$dest_lang      = $import_coordinates->dest_lang;
 			$dest_post_id   = $import_coordinates->dest_post_id;

includes/ContentImport/ImportCoordinates.php

@@ -55,9 +55,11 @@ public function validate() {
 		if ( ! get_blog_post( $this->source_blog_id, $this->source_post_id ) ) {
 			return false;
 		}
+
 		if ( ! get_blog_post( $this->dest_blog_id, $this->dest_post_id ) ) {
 			return false;
 		}
+
 		if ( ! $this->source_post instanceof \WP_Post ) {
 			return false;
 		}

includes/MslsBlogCollection.php

@@ -134,14 +134,8 @@ public function get_blogs_of_reference_user( MslsOptions $options ) {
 		);
 
 		$blogs = get_blogs_of_user( $reference_user );
-
-		/**
-		 * @todo Check if this is still useful
-		 */
-		if ( is_array( $blogs ) ) {
-			foreach ( $blogs as $key => $blog ) {
-				$blogs[ $key ]->blog_id = $blog->userblog_id;
-			}
+		foreach ( $blogs as $key => $blog ) {
+			$blogs[ $key ]->blog_id = $blog->userblog_id;
 		}
 
 		return $blogs;

includes/MslsOptionsTax.php

@@ -16,7 +16,7 @@ class MslsOptionsTax extends MslsOptions implements OptionsTaxInterface {
 	/**
 	 * @param int $id
 	 *
-	 * @return MslsOptionsTax
+	 * @return OptionsTaxInterface
 	 */
 	public static function create( $id = 0 ): OptionsTaxInterface {
 		$id = ! empty( $id ) ? (int) $id : get_queried_object_id();

includes/MslsOptionsTaxTerm.php

@@ -23,7 +23,7 @@ class MslsOptionsTaxTerm extends MslsOptionsTax implements OptionsTaxInterface {
 	/**
 	 * Check and correct URL
 	 *
-	 * @param string             $url
+	 * @param mixed              $url
 	 * @param MslsOptionsTaxTerm $options
 	 *
 	 * @return string

includes/MslsPostTagClassic.php

@@ -108,12 +108,12 @@ public function the_input( ?\WP_Term $tag, string $title_format, string $item_fo
 	/**
 	 * Prints options inputs
 	 *
-	 * @param MslsBlog       $blog
-	 * @param string         $type
-	 * @param MslsOptionsTax $mydata
-	 * @param string         $item_format
+	 * @param MslsBlog            $blog
+	 * @param string              $type
+	 * @param OptionsTaxInterface $mydata
+	 * @param string              $item_format
 	 */
-	public function print_option( MslsBlog $blog, string $type, MslsOptionsTax $mydata, string $item_format ): void {
+	public function print_option( MslsBlog $blog, string $type, OptionsTaxInterface $mydata, string $item_format ): void {
 		switch_to_blog( $blog->userblog_id );
 
 		$language  = $blog->get_language();