Moved PatrolLog to logging folder, sorted the autoloaded entries alphabetically

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index ae09c7e..1f2d111 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -164,7 +164,6 @@ $wgAutoloadLocalClasses = array(
        'PageQueryPage' => 'includes/PageQueryPage.php',
        'Pager' => 'includes/Pager.php',
        'PasswordError' => 'includes/User.php',
-       'PatrolLog' => 'includes/PatrolLog.php',
        'PermissionsError' => 'includes/Exception.php',
        'PhpHttpRequest' => 'includes/HttpFunctions.php',
        'PoolCounter' => 'includes/PoolCounter.php',
@@ -538,16 +537,17 @@ $wgAutoloadLocalClasses = array(
        'JSParser' => 'includes/libs/jsminplus.php',
 
        # includes/logging
+       'DatabaseLogEntry' => 'includes/logging/LogEntry.php',
+       'DeleteLogFormatter' => 'includes/logging/LogFormatter.php',
+       'LegacyLogFormatter' => 'includes/logging/LogFormatter.php',
        'LogEntry' => 'includes/logging/LogEntry.php',
        'LogEntryBase' => 'includes/logging/LogEntry.php',
-       'DatabaseLogEntry' => 'includes/logging/LogEntry.php',
-       'RCDatabaseLogEntry' => 'includes/logging/LogEntry.php',
-       'ManualLogEntry' => 'includes/logging/LogEntry.php',
        'LogFormatter' => 'includes/logging/LogFormatter.php',
-       'LegacyLogFormatter' => 'includes/logging/LogFormatter.php',
-       'DeleteLogFormatter' => 'includes/logging/LogFormatter.php',
+       'ManualLogEntry' => 'includes/logging/LogEntry.php',
        'MoveLogFormatter' => 'includes/logging/LogFormatter.php',
+       'PatrolLog' => 'includes/logging/PatrolLog.php',
        'PatrolLogFormatter' => 'includes/logging/LogFormatter.php',
+       'RCDatabaseLogEntry' => 'includes/logging/LogEntry.php',
 
        # includes/media
        'BitmapHandler' => 'includes/media/Bitmap.php',

diff --git a/includes/PatrolLog.php b/includes/PatrolLog.php
deleted file mode 100644 (file)
index 04fdc4f..0000000
--- a/includes/PatrolLog.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Class containing static functions for working with
- * logs of patrol events
- *
- * @author Rob Church <robchur@gmail.com>
- * @author Niklas Laxström
- */
-class PatrolLog {
-
-       /**
-        * Record a log event for a change being patrolled
-        *
-        * @param $rc Mixed: change identifier or RecentChange object
-        * @param $auto Boolean: was this patrol event automatic?
-        *
-        * @return bool
-        */
-       public static function record( $rc, $auto = false ) {
-               if ( !$rc instanceof RecentChange ) {
-                       $rc = RecentChange::newFromId( $rc );
-                       if ( !is_object( $rc ) ) {
-                               return false;
-                       }
-               }
-
-               $title = Title::makeTitleSafe( $rc->getAttribute( 'rc_namespace' ), $rc->getAttribute( 'rc_title' ) );
-               if( $title ) {
-                       $entry = new ManualLogEntry( 'patrol', 'patrol' );
-                       $entry->setTarget( $title );
-                       $entry->setParameters( self::buildParams( $rc, $auto ) );
-                       $entry->setPerformer( User::newFromName( $rc->getAttribute( 'rc_user_text' ), false ) );
-                       $logid = $entry->insert();
-                       if ( !$auto ) {
-                               $entry->publish( $logid, 'udp' );
-                       }
-                       return true;
-               }
-               return false;
-       }
-
-       /**
-        * Prepare log parameters for a patrolled change
-        *
-        * @param $change RecentChange to represent
-        * @param $auto Boolean: whether the patrol event was automatic
-        * @return Array
-        */
-       private static function buildParams( $change, $auto ) {
-               return array(
-                       '4::curid' => $change->getAttribute( 'rc_this_oldid' ),
-                       '5::previd' => $change->getAttribute( 'rc_last_oldid' ),
-                       '6::auto' => (int)$auto
-               );
-       }
-
-}

diff --git a/includes/logging/PatrolLog.php b/includes/logging/PatrolLog.php
new file mode 100644 (file)
index 0000000..04fdc4f
--- /dev/null
+++ b/includes/logging/PatrolLog.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Class containing static functions for working with
+ * logs of patrol events
+ *
+ * @author Rob Church <robchur@gmail.com>
+ * @author Niklas Laxström
+ */
+class PatrolLog {
+
+       /**
+        * Record a log event for a change being patrolled
+        *
+        * @param $rc Mixed: change identifier or RecentChange object
+        * @param $auto Boolean: was this patrol event automatic?
+        *
+        * @return bool
+        */
+       public static function record( $rc, $auto = false ) {
+               if ( !$rc instanceof RecentChange ) {
+                       $rc = RecentChange::newFromId( $rc );
+                       if ( !is_object( $rc ) ) {
+                               return false;
+                       }
+               }
+
+               $title = Title::makeTitleSafe( $rc->getAttribute( 'rc_namespace' ), $rc->getAttribute( 'rc_title' ) );
+               if( $title ) {
+                       $entry = new ManualLogEntry( 'patrol', 'patrol' );
+                       $entry->setTarget( $title );
+                       $entry->setParameters( self::buildParams( $rc, $auto ) );
+                       $entry->setPerformer( User::newFromName( $rc->getAttribute( 'rc_user_text' ), false ) );
+                       $logid = $entry->insert();
+                       if ( !$auto ) {
+                               $entry->publish( $logid, 'udp' );
+                       }
+                       return true;
+               }
+               return false;
+       }
+
+       /**
+        * Prepare log parameters for a patrolled change
+        *
+        * @param $change RecentChange to represent
+        * @param $auto Boolean: whether the patrol event was automatic
+        * @return Array
+        */
+       private static function buildParams( $change, $auto ) {
+               return array(
+                       '4::curid' => $change->getAttribute( 'rc_this_oldid' ),
+                       '5::previd' => $change->getAttribute( 'rc_last_oldid' ),
+                       '6::auto' => (int)$auto
+               );
+       }
+
+}