Adding upstream version 6.5+dfsg1.upstream/6.5+dfsg1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 10 insertions, 1 deletions

diff --git a/wp-includes/pomo/entry.php b/wp-includes/pomo/entry.php
index 9ca63f8..e1b1c8f 100644
--- a/wp-includes/pomo/entry.php
+++ b/wp-includes/pomo/entry.php
@@ -10,6 +10,8 @@
 if ( ! class_exists( 'Translation_Entry', false ) ) :
 	/**
 	 * Translation_Entry class encapsulates a translatable string.
+	 *
+	 * @since 2.8.0
 	 */
 	#[AllowDynamicProperties]
 	class Translation_Entry {
@@ -75,6 +77,7 @@ if ( ! class_exists( 'Translation_Entry', false ) ) :
 		/**
 		 * PHP4 constructor.
 		 *
+		 * @since 2.8.0
 		 * @deprecated 5.4.0 Use __construct() instead.
 		 *
 		 * @see Translation_Entry::__construct()
@@ -87,6 +90,8 @@ if ( ! class_exists( 'Translation_Entry', false ) ) :
 		/**
 		 * Generates a unique key for this entry.
 		 *
+		 * @since 2.8.0
+		 *
 		 * @return string|false The key or false if the entry is null.
 		 */
 		public function key() {
@@ -103,7 +108,11 @@ if ( ! class_exists( 'Translation_Entry', false ) ) :
 		}
 
 		/**
-		 * @param object $other
+		 * Merges another translation entry with the current one.
+		 *
+		 * @since 2.8.0
+		 *
+		 * @param Translation_Entry $other Other translation entry.
 		 */
 		public function merge_with( &$other ) {
 			$this->flags      = array_unique( array_merge( $this->flags, $other->flags ) );