Merge branch 'ari/convert-blog-description-to-interactive' into ari/plugin-installer

Author: aristath

classes/class-page-types.php

@@ -12,6 +12,13 @@
  */
 class Page_Types {
 
+	/**
+	 * The page types.
+	 *
+	 * @var array
+	 */
+	public static $page_types = [];
+
 	/**
 	 * The taxonomy name.
 	 *
@@ -145,9 +152,8 @@ public function maybe_update_terms() {
 	 * @return array
 	 */
 	public function get_page_types() {
-		static $page_types;
-		if ( null !== $page_types ) {
-			return $page_types;
+		if ( null !== static::$page_types ) {
+			return static::$page_types;
 		}
 
 		$terms = \get_terms(
@@ -158,21 +164,21 @@ public function get_page_types() {
 		);
 
 		if ( ! $terms || \is_wp_error( $terms ) ) {
-			$page_types = [];
-			return $page_types;
+			static::$page_types = [];
+			return static::$page_types;
 		}
 
-		$page_types = [];
+		static::$page_types = [];
 		foreach ( $terms as $term ) {
-			$page_types[] = [
+			static::$page_types[] = [
 				'id'          => $term->term_id,
 				'slug'        => $term->slug,
 				'title'       => $term->name,
 				'description' => $term->description,
 			];
 		}
 
-		return $page_types;
+		return static::$page_types;
 	}
 
 	/**

classes/update/class-update-170.php

@@ -43,7 +43,7 @@ private function make_tasks_interactive() {
 			$task = \progress_planner()->get_suggested_tasks_db()->get_tasks_by(
 				[
 					'task_id'     => $task_id,
-					'post_status' => 'publish',
+					'post_status' => [ 'publish', 'future' ],
 				]
 			);
 

tests/phpunit/test-class-page-types.php

@@ -121,6 +121,10 @@ public function test_maybe_update_terms() {
 	 * @return void
 	 */
 	public function test_get_page_types() {
+		// Reset the page types, before the test.
+		$page_types_object              = \progress_planner()->get_page_types();
+		$page_types_object::$page_types = null;
+
 		$page_types = \progress_planner()->get_page_types()->get_page_types();
 		$lessons    = self::get_lessons();
 		$this->assertCount( \count( $lessons ), $page_types );