From 7cc134afe6fde940c57fd84505fafe3e8d5e2f81 Mon Sep 17 00:00:00 2001
From: Miroslav Mitev <m1r0@users.noreply.github.com>
Date: Mon, 4 Nov 2024 14:43:58 +0200
Subject: [PATCH] Fix psalm issues

---
 config/psalm/psalm-baseline.xml     | 38 +++--------------------------
 includes/class-sensei-lesson.php    | 11 +--------
 includes/class-sensei-posttypes.php |  8 +++---
 psalm.xml                           |  5 ++++
 4 files changed, 14 insertions(+), 48 deletions(-)

diff --git a/config/psalm/psalm-baseline.xml b/config/psalm/psalm-baseline.xml
index 02fb9eb024..63500b38af 100644
--- a/config/psalm/psalm-baseline.xml
+++ b/config/psalm/psalm-baseline.xml
@@ -1789,9 +1789,8 @@
       <code>$user_id</code>
       <code>$which</code>
     </MissingParamType>
-    <MissingPropertyType occurrences="3">
+    <MissingPropertyType occurrences="2">
       <code>$file</code>
-      <code>$name</code>
       <code>$page_slug</code>
     </MissingPropertyType>
     <PossiblyFalseArgument occurrences="1">
@@ -2422,18 +2421,6 @@
       <code>get_queried_object()-&gt;ID</code>
       <code>get_queried_object()-&gt;post_type</code>
     </PossiblyNullPropertyFetch>
-    <PropertyNotSetInConstructor occurrences="10">
-      <code>$course</code>
-      <code>$lesson</code>
-      <code>$messages</code>
-      <code>$question</code>
-      <code>$quiz</code>
-      <code>WooThemes_Sensei_PostTypes</code>
-      <code>WooThemes_Sensei_PostTypes</code>
-      <code>WooThemes_Sensei_PostTypes</code>
-      <code>WooThemes_Sensei_PostTypes</code>
-      <code>WooThemes_Sensei_PostTypes</code>
-    </PropertyNotSetInConstructor>
     <RedundantConditionGivenDocblockType occurrences="1">
       <code>$post instanceof WP_Post</code>
     </RedundantConditionGivenDocblockType>
@@ -4181,11 +4168,9 @@
     <InvalidGlobal occurrences="1">
       <code>global $sensei_email_data;</code>
     </InvalidGlobal>
-    <MissingPropertyType occurrences="6">
-      <code>$heading</code>
+    <MissingPropertyType occurrences="4">
       <code>$learner</code>
       <code>$recipient</code>
-      <code>$subject</code>
       <code>$teacher</code>
       <code>$template</code>
     </MissingPropertyType>
@@ -4432,8 +4417,7 @@
       <code>$post</code>
       <code>$post</code>
     </ParamNameMismatch>
-    <PossiblyNullArgument occurrences="2">
-      <code>get_edit_post_link( $post )</code>
+    <PossiblyNullArgument occurrences="1">
       <code>get_edit_post_link( $post-&gt;ID )</code>
     </PossiblyNullArgument>
     <PropertyNotSetInConstructor occurrences="4">
@@ -4970,13 +4954,6 @@
     </TypeDoesNotContainType>
   </file>
   <file src="includes/rest-api/class-sensei-rest-api-course-progress-controller.php">
-    <InvalidClass occurrences="1">
-      <code>WP_HTTP</code>
-    </InvalidClass>
-    <PossiblyInvalidArrayAssignment occurrences="2">
-      <code>$result[ $student_id ][ $course_id ]</code>
-      <code>$result[ $student_id ][ $course_id ]</code>
-    </PossiblyInvalidArrayAssignment>
     <PossiblyNullArgument occurrences="1">
       <code>$edit_course_cap</code>
     </PossiblyNullArgument>
@@ -5013,8 +4990,7 @@
       <code>WP_HTTP</code>
       <code>WP_HTTP</code>
     </InvalidClass>
-    <PossiblyInvalidArrayAssignment occurrences="2">
-      <code>$result[ $user_id ][ $course_id ]</code>
+    <PossiblyInvalidArrayAssignment occurrences="1">
       <code>$result[ $user_id ][ $course_id ]</code>
     </PossiblyInvalidArrayAssignment>
     <PossiblyNullArgument occurrences="1">
@@ -5249,12 +5225,6 @@
     </UndefinedPropertyFetch>
   </file>
   <file src="includes/rest-api/class-sensei-rest-api-question-helpers-trait.php">
-    <ArgumentTypeCoercion occurrences="1">
-      <code>$post_args</code>
-    </ArgumentTypeCoercion>
-    <InvalidArgument occurrences="1">
-      <code>$post_args</code>
-    </InvalidArgument>
     <PossibleRawObjectIteration occurrences="1">
       <code>$question_categories</code>
     </PossibleRawObjectIteration>
diff --git a/includes/class-sensei-lesson.php b/includes/class-sensei-lesson.php
index a03593d3c4..8412af07d5 100755
--- a/includes/class-sensei-lesson.php
+++ b/includes/class-sensei-lesson.php
@@ -57,15 +57,6 @@ class Sensei_Lesson {
 	 */
 	private $lesson_id_updating;
 
-	/**
-	 * Message to display on the legacy quiz meta boxes.
-	 *
-	 * @since 3.9.1
-	 *
-	 * @var string
-	 */
-	private $legacy_quiz_message;
-
 	/**
 	 * Constructor.
 	 *
@@ -1245,7 +1236,7 @@ public function lesson_course_meta_box_content() {
 	}
 
 	/**
-	 * Get the legazy quiz message.
+	 * Get the message to display on the legacy quiz meta boxes.
 	 *
 	 * @return string
 	 */
diff --git a/includes/class-sensei-posttypes.php b/includes/class-sensei-posttypes.php
index 06fc77bd50..1854bc9863 100755
--- a/includes/class-sensei-posttypes.php
+++ b/includes/class-sensei-posttypes.php
@@ -910,11 +910,11 @@ public function setup_lesson_tag_taxonomy() {
 	/**
 	 * Get the singular, plural and menu label names for the post types.
 	 *
-	 * @param string $post_type The post type.
+	 * @param string|null $post_type The post type.
 	 *
-	 * @return string[]
+	 * @return array
 	 */
-	private function get_main_post_type_labels( $post_type ) {
+	private function get_main_post_type_labels( $post_type = null ) {
 		$labels = array(
 			'course'            => array(
 				'singular' => __( 'Course', 'sensei-lms' ),
@@ -948,7 +948,7 @@ private function get_main_post_type_labels( $post_type ) {
 			),
 		);
 
-		return $labels[ $post_type ];
+		return $post_type ? $labels[ $post_type ] : $labels;
 	}
 
 	/**
diff --git a/psalm.xml b/psalm.xml
index c78dd94e95..2f153e5b36 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -32,6 +32,11 @@
 				<referencedProperty name="Sensei_Main::$lesson_progress_repository_factory" />
 				<referencedProperty name="Sensei_Main::$quiz_progress_repository_factory" />
 				<referencedProperty name="Sensei_REST_API_Lesson_Actions_Controller::$schema" />
+				<referencedProperty name="Sensei_PostTypes::$course" />
+				<referencedProperty name="Sensei_PostTypes::$lesson" />
+				<referencedProperty name="Sensei_PostTypes::$question" />
+				<referencedProperty name="Sensei_PostTypes::$quiz" />
+				<referencedProperty name="Sensei_PostTypes::$messages" />
 			</errorLevel>
 		</PropertyNotSetInConstructor>
 		<UndefinedClass>