WPML: Fix usage of question categories in translated quizzes

changelog/fix-wpml-progress

@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Share student progress and quiz submission across translations

changelog/fix-wpml-question-categories

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fix usage of question categories in translated quizzes

config/psalm/psalm-baseline.xml

@@ -1422,22 +1422,19 @@
     <MissingDocblockType occurrences="1">
       <code>public $token;</code>
     </MissingDocblockType>
-    <MissingParamType occurrences="16">
+    <MissingParamType occurrences="13">
       <code>$class</code>
       <code>$classes</code>
       <code>$course</code>
       <code>$course_id</code>
       <code>$course_id</code>
       <code>$course_id</code>
       <code>$course_id</code>
-      <code>$course_id</code>
       <code>$excludes</code>
       <code>$excludes</code>
       <code>$message</code>
       <code>$query</code>
       <code>$query</code>
-      <code>$should_send</code>
-      <code>$user_id</code>
       <code>$user_id</code>
     </MissingParamType>
     <MissingPropertyType occurrences="1">
@@ -1885,11 +1882,9 @@
       <code>'WP_Post'</code>
       <code>'WP_User'</code>
     </ArgumentTypeCoercion>
-    <DocblockTypeContradiction occurrences="4">
+    <DocblockTypeContradiction occurrences="2">
       <code>! isset( $lesson_id )</code>
-      <code>- 1 !== $new_course</code>
       <code>-1</code>
-      <code>-1 !== $new_complexity</code>
     </DocblockTypeContradiction>
     <FalsableReturnStatement occurrences="2">
       <code>empty( $block['innerBlocks'][0]['attrs']['id'] ) ? null : wp_get_attachment_url( get_post_thumbnail_id( $block['innerBlocks'][0]['attrs']['id'] ) )</code>
@@ -2080,12 +2075,10 @@
       <code>is_array( $question_data )</code>
       <code>is_countable( $questions_array )</code>
     </RedundantCondition>
-    <RedundantConditionGivenDocblockType occurrences="9">
+    <RedundantConditionGivenDocblockType occurrences="7">
       <code>! is_wp_error( $multiple_id )</code>
       <code>$module_term</code>
       <code>$module_term</code>
-      <code>- 1 !== $new_course</code>
-      <code>-1 !== $new_complexity</code>
       <code>is_array( $data ) &amp;&amp; count( $data ) &gt; 0</code>
       <code>is_array( $this-&gt;meta_fields )</code>
       <code>isset( $this-&gt;meta_fields ) &amp;&amp; is_array( $this-&gt;meta_fields )</code>
@@ -2483,7 +2476,7 @@
       <code>public static function gap_fill_load_question_data( $question_data, $question_id, $quiz_id ) {</code>
       <code>public static function multiple_choice_load_question_data( $question_data, $question_id, $quiz_id ) {</code>
     </InvalidDocblock>
-    <InvalidScalarArgument occurrences="29">
+    <InvalidScalarArgument occurrences="27">
       <code>$id</code>
       <code>$lesson_id</code>
       <code>$lesson_id</code>
@@ -2501,8 +2494,6 @@
       <code>$lesson_id</code>
       <code>$lesson_id</code>
       <code>$lesson_id</code>
-      <code>$lesson_id</code>
-      <code>$lesson_id</code>
       <code>$question_id</code>
       <code>$question_id</code>
       <code>$question_id</code>
@@ -2726,9 +2717,6 @@
       <code>! is_array( $new_value )</code>
       <code>! is_array( $old_value )</code>
     </DocblockTypeContradiction>
-    <DuplicateArrayKey occurrences="1">
-      <code>'type'          =&gt; 'email'</code>
-    </DuplicateArrayKey>
     <InvalidArgument occurrences="1"/>
     <MissingParamType occurrences="3">
       <code>$include_milliseconds</code>
@@ -4736,9 +4724,8 @@
     </PossiblyInvalidPropertyFetch>
   </file>
   <file src="includes/internal/student-progress/quiz-progress/repositories/class-comments-based-quiz-progress-repository.php">
-    <InvalidScalarArgument occurrences="2">
+    <InvalidScalarArgument occurrences="1">
       <code>$comment-&gt;comment_post_ID</code>
-      <code>$lesson_id</code>
     </InvalidScalarArgument>
     <PossiblyInvalidIterator occurrences="2">
       <code>$comments</code>
@@ -5187,6 +5174,11 @@
       <code>Sensei_REST_API_Import_Controller</code>
     </PropertyNotSetInConstructor>
   </file>
+  <file src="includes/rest-api/class-sensei-rest-api-internal.php">
+    <PossiblyNullArgument occurrences="1">
+      <code>Sensei()-&gt;tour</code>
+    </PossiblyNullArgument>
+  </file>
   <file src="includes/rest-api/class-sensei-rest-api-lesson-quiz-controller.php">
     <ArgumentTypeCoercion occurrences="1"/>
     <DocblockTypeContradiction occurrences="1">
@@ -5422,6 +5414,11 @@
       <code>Sensei_REST_API_Theme_Controller</code>
     </PropertyNotSetInConstructor>
   </file>
+  <file src="includes/rest-api/class-sensei-rest-api-tour-controller.php">
+    <PropertyNotSetInConstructor occurrences="1">
+      <code>Sensei_REST_API_Tour_Controller</code>
+    </PropertyNotSetInConstructor>
+  </file>
   <file src="includes/sensei-functions.php">
     <InvalidIterator occurrences="2">
       <code>$base</code>
@@ -5798,7 +5795,8 @@
     </RedundantCast>
   </file>
   <file src="includes/wpml/class-language-details.php">
-    <DocblockTypeContradiction occurrences="1">
+    <DocblockTypeContradiction occurrences="2">
+      <code>is_wp_error( $question_id )</code>
       <code>is_wp_error( $question_id )</code>
     </DocblockTypeContradiction>
   </file>
@@ -5818,14 +5816,4 @@
       <code>function wp_remote_request($url, $args = array())</code>
     </InvalidDocblock>
   </file>
-  <file src="includes/rest-api/class-sensei-rest-api-tour-controller.php">
-	<PropertyNotSetInConstructor occurrences="1">
-	  <code>Sensei_REST_API_Tour_Controller</code>
-	</PropertyNotSetInConstructor>
-  </file>
-  <file src="includes/rest-api/class-sensei-rest-api-internal.php">
-	<PossiblyNullArgument occurrences="1">
-	  <code>Sensei()->tour</code>
-	</PossiblyNullArgument>
-  </file>
 </files>

includes/blocks/class-sensei-block-take-course.php

@@ -48,7 +48,20 @@ public function render_take_course_block( $attributes, $content ): string {
 		}
 
 		$course_id = $post->ID;
-		$html      = '';
+
+		/**
+		 * Filters the course ID for the take course block.
+		 *
+		 * @hook sensei_block_take_course_course_id
+		 *
+		 * @since $$next-version$$
+		 *
+		 * @param {int} $course_id The course ID.
+		 * @return {int} The course ID.
+		 */
+		$course_id = apply_filters( 'sensei_block_take_course_course_id', $course_id );
+
+		$html = '';
 
 		if ( 'course' !== get_post_type( $course_id ) ) {
 			return '';
@@ -117,7 +130,7 @@ private function render_with_start_course_form( $course_id, $button ) {
 	 *
 	 * @return string The html with the added classes.
 	 */
-	private function add_button_classes( $button ) : string {
+	private function add_button_classes( $button ): string {
 		wp_enqueue_script( 'sensei-stop-double-submission' );
 
 		if ( preg_match( '/<button(.*)class="(.*)"/', $button ) ) {

includes/blocks/class-sensei-course-progress-block.php

@@ -46,7 +46,6 @@ public function register_block() {
 	public function render_course_progress( $attributes ): string {
 
 		$course_id = $attributes['postId'] ?? get_the_ID();
-
 		if ( 'course' !== get_post_type( $course_id ) ) {
 			return '';
 		}