Closes #5885: Preload: Don't try to preload private pages

inc/Engine/Preload/Controller/CheckExcludedTrait.php

@@ -64,4 +64,17 @@ protected function is_excluded_by_filter( string $url ): bool {
 		}
 		return false;
 	}
+
+	/**
+	 * Checks that a page is private.
+	 *
+	 * @param   string $url  Page url.
+	 *
+	 * @return  bool         Return true if page is private; false otherwise.
+	 */
+	protected function is_private( string $url ) : bool {
+		$post_id = url_to_postid( $url );
+
+		return 'private' === get_post_status( $post_id );
+	}
 }

inc/Engine/Preload/Controller/ClearCache.php

@@ -31,6 +31,10 @@ public function __construct( Cache $query ) {
 	public function partial_clean( array $urls ) {
 		foreach ( $urls as $url ) {
 
+			if ( $this->is_private( $url ) ) {
+				continue;
+			}
+
 			if ( ! $this->is_excluded_by_filter( $url ) ) {
 				$this->query->create_or_update(
 					[

tests/Fixtures/inc/Engine/Preload/Controller/ClearCache/partialClean.php

@@ -8,6 +8,7 @@
 			],
 			'is_excluded' => false,
 			'is_excluded_by_filter' => false,
+			'is_private' => false,
 		],
 		'expected' => [
 			'urls' => [
@@ -34,6 +35,7 @@
 			],
 			'is_excluded' => true,
 			'is_excluded_by_filter' => false,
+			'is_private' => false,
 		],
 		'expected' => [
 			'urls' => [
@@ -60,6 +62,28 @@
 			],
 			'is_excluded' => true,
 			'is_excluded_by_filter' => true,
+			'is_private' => false,
+		],
+		'expected' => [
+			'urls' => [
+				[
+					'url',
+				],
+				[
+					'url1',
+				]
+			]
+		]
+	],
+	'excludePostStatusWithPrivateStatus' => [
+		'config' => [
+			'urls' => [
+				'url',
+				'url1',
+			],
+			'is_excluded' => true,
+			'is_excluded_by_filter' => true,
+			'is_private' => true,
 		],
 		'expected' => [
 			'urls' => [

tests/Unit/inc/Engine/Preload/Controller/ClearCache/partialClean.php

@@ -20,24 +20,39 @@ protected function setUp(): void
 	{
 		parent::setUp();
 		$this->query = $this->createMock(Cache::class);
-		$this->controller = Mockery::mock(ClearCache::class . '[is_excluded,is_excluded_by_filter]', [$this->query])
+		$this->controller = Mockery::mock(ClearCache::class . '[is_excluded,is_excluded_by_filter,is_private]', [$this->query])
 			->shouldAllowMockingProtectedMethods();
 	}
 
+
 	/**
 	 * @dataProvider configTestData
 	 */
 	public function testShouldDoAsExpected($config, $expected) {
 
 		foreach ($config['urls'] as $url) {
-			$this->controller->expects()->is_excluded_by_filter($url)->andReturn($config['is_excluded']);
-			$this->controller->shouldReceive('is_excluded_by_filter')->with($url)->andReturn($config['is_excluded_by_filter']);
+			$this->controller->expects()->is_private($url)->andReturn($config['is_private']);
+			if ( ! $config['is_private'] ) {
+				$this->controller->expects()->is_excluded_by_filter($url)->andReturn($config['is_excluded']);
+				$this->controller->shouldReceive('is_excluded_by_filter')->with($url)->andReturn($config['is_excluded_by_filter']);
+			}
+			else{
+				$this->controller->expects()->is_excluded_by_filter($url)->never();
+				$this->controller->shouldReceive('is_excluded_by_filter')->never();
+			}
+		}
+
+		if ( $config['is_private'] ) {
+			$this->query->expects($this->never())->method('create_or_update');
+			$this->query->expects($this->never())->method('delete_by_url');
 		}
-		if(! $config['is_excluded']) {
-			if(! $config['is_excluded_by_filter']) {
-				$this->query->expects(self::atLeastOnce())->method('create_or_update')->withConsecutive(...$expected['urls']);
-			} else {
-				$this->query->expects(self::atLeastOnce())->method('delete_by_url')->withConsecutive(...$expected['urls']);
+		else {
+			if(! $config['is_excluded']) {
+				if(! $config['is_excluded_by_filter']) {
+					$this->query->expects(self::atLeastOnce())->method('create_or_update')->withConsecutive(...$expected['urls']);
+				} else {
+					$this->query->expects(self::atLeastOnce())->method('delete_by_url')->withConsecutive(...$expected['urls']);
+				}
 			}
 		}