Merge "Declare visibility on log class related properties"

diff --combined includes/logging/LogEntry.php
index 7803bca,0099136..a725402
--- 1/includes/logging/LogEntry.php
--- 2/includes/logging/LogEntry.php
+++ b/includes/logging/LogEntry.php
@@@ -176,6 -176,11 +176,11 @@@ class DatabaseLogEntry extends LogEntry
        /** @var User */
        protected $performer;
  
+       /** @var bool Whether the parameters for this log entry are stored in new
+        *    or old format.
+        */
+       protected $legacy;
+ 
        protected function __construct( $row ) {
                $this->row = $row;
        }
@@@ -361,6 -366,9 +366,9 @@@ class ManualLogEntry extends LogEntryBa
        /** @var int Deletion state of the log entry */
        protected $deleted;
  
+       /** @var int ID of the log entry */
+       protected $id;
+ 
        /**
         * Constructor.
         *
@@@ -469,7 -477,7 +477,7 @@@
        public function insert( IDatabase $dbw = null ) {
                global $wgContLang;
  
 -              $dbw = $dbw ? : wfGetDB( DB_MASTER );
 +              $dbw = $dbw ?: wfGetDB( DB_MASTER );
                $id = $dbw->nextSequenceValue( 'logging_log_id_seq' );
  
                if ( $this->timestamp === null ) {

diff --combined includes/logging/LogPage.php
index ae8938e,7e5d09e..f5798e2
--- 1/includes/logging/LogPage.php
--- 2/includes/logging/LogPage.php
+++ b/includes/logging/LogPage.php
@@@ -40,31 -40,37 +40,37 @@@ class LogPage 
        const SUPPRESSED_ACTION = 9;
  
        /** @var bool */
-       var $updateRecentChanges;
+       public $updateRecentChanges;
  
        /** @var bool */
-       var $sendToUDP;
+       public $sendToUDP;
+ 
+       /** @var string Plaintext version of the message for IRC */
+       private $ircActionText;
+ 
+       /** @var string Plaintext version of the message */
+       private $actionText;
  
        /** @var string One of '', 'block', 'protect', 'rights', 'delete',
         *    'upload', 'move'
         */
-       var $type;
+       private $type;
  
        /** @var string One of '', 'block', 'protect', 'rights', 'delete',
         *   'upload', 'move', 'move_redir' */
-       var $action;
+       private $action;
  
        /** @var string Comment associated with action */
-       var $comment;
+       private $comment;
  
        /** @var string Blob made of a parameters array */
-       var $params;
+       private $params;
  
        /** @var User The user doing the action */
-       var $doer;
+       private $doer;
  
        /** @var Title */
-       var $target;
+       private $target;
  
        /**
         * Constructor
@@@ -89,6 -95,7 +95,7 @@@
                $dbw = wfGetDB( DB_MASTER );
                $log_id = $dbw->nextSequenceValue( 'logging_log_id_seq' );
  
+               // @todo FIXME private/protected/public property?
                $this->timestamp = $now = wfTimestampNow();
                $data = array(
                        'log_id' => $log_id,
@@@ -129,7 -136,7 +136,7 @@@
                                $this->type, $this->action, $this->target, $this->comment,
                                $this->params, $newId, $this->getRcCommentIRC()
                        );
 -                      $rc->notifyRC2UDP();
 +                      $rc->notifyRCFeeds();
                }
  
                return $newId;
@@@ -213,8 -220,6 +220,8 @@@
        public static function logName( $type ) {
                global $wgLogNames;
  
 +              wfDeprecated( __METHOD__, '1.21' );
 +
                if ( isset( $wgLogNames[$type] ) ) {
                        return str_replace( '_', ' ', wfMessage( $wgLogNames[$type] )->text() );
                } else {
@@@ -234,8 -239,6 +241,8 @@@
        public static function logHeader( $type ) {
                global $wgLogHeaders;
  
 +              wfDeprecated( __METHOD__, '1.21' );
 +
                return wfMessage( $wgLogHeaders[$type] )->parse();
        }