test: fix child attachment URLs and PHPCS alignment

Child attachment URLs with pretty permalinks take the form
/parent-slug/attachment-slug/, not just /attachment-slug/. Fix test URLs
to include the parent post slug.

Break consecutive self:: assignments with blank lines to avoid PHPCS
MultipleStatementAlignment warnings between differently-named properties.

Author: Claude

tests/phpunit/tests/canonical/attachmentRedirect.php

@@ -45,6 +45,7 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 				'post_status' => 'publish',
 			)
 		);
+
 		self::$attached_to_public = $factory->post->create_and_get(
 			array(
 				'post_type'   => 'attachment',
@@ -66,6 +67,7 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 				'post_author' => self::$editor_user,
 			)
 		);
+
 		self::$attached_to_private = $factory->post->create_and_get(
 			array(
 				'post_type'   => 'attachment',
@@ -87,6 +89,7 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 				'post_author' => self::$editor_user,
 			)
 		);
+
 		self::$attached_to_draft = $factory->post->create_and_get(
 			array(
 				'post_type'   => 'attachment',
@@ -140,13 +143,16 @@ public function test_unattached_query_var_url_redirects_when_pages_disabled() {
 	// -------------------------------------------------------------------------
 
 	/**
-	 * Attachment on a public post should redirect via slug URL.
+	 * Attachment on a public post should redirect via its child slug URL.
+	 *
+	 * With pretty permalinks, child attachment URLs take the form
+	 * /parent-slug/attachment-slug/.
 	 */
 	public function test_attached_to_public_post_slug_url_redirects() {
 		update_option( 'wp_attachment_pages_enabled', 0 );
 		$this->set_permalink_structure( '/%postname%/' );
 
-		$this->assertCanonical( '/public-attached-image/', $this->get_expected_path( self::$attached_to_public->ID ) );
+		$this->assertCanonical( '/public-post/public-attached-image/', $this->get_expected_path( self::$attached_to_public->ID ) );
 	}
 
 	// -------------------------------------------------------------------------
@@ -162,7 +168,7 @@ public function test_attached_to_private_post_no_redirect_for_anonymous() {
 		$this->set_permalink_structure( '/%postname%/' );
 		wp_set_current_user( 0 );
 
-		$this->assertCanonical( '/private-attached-image/', '/private-attached-image/' );
+		$this->assertCanonical( '/private-post/private-attached-image/', '/private-post/private-attached-image/' );
 	}
 
 	// -------------------------------------------------------------------------
@@ -177,7 +183,7 @@ public function test_attached_to_private_post_redirects_for_authorized_user() {
 		$this->set_permalink_structure( '/%postname%/' );
 		wp_set_current_user( self::$editor_user );
 
-		$this->assertCanonical( '/private-attached-image/', $this->get_expected_path( self::$attached_to_private->ID ) );
+		$this->assertCanonical( '/private-post/private-attached-image/', $this->get_expected_path( self::$attached_to_private->ID ) );
 	}
 
 	// -------------------------------------------------------------------------
@@ -192,7 +198,7 @@ public function test_attached_to_draft_post_no_redirect_for_anonymous() {
 		$this->set_permalink_structure( '/%postname%/' );
 		wp_set_current_user( 0 );
 
-		$this->assertCanonical( '/draft-attached-image/', '/draft-attached-image/' );
+		$this->assertCanonical( '/draft-post/draft-attached-image/', '/draft-post/draft-attached-image/' );
 	}
 
 	// -------------------------------------------------------------------------