phpwiki-checkins

[phpwiki-checkins] SF.net SVN: phpwiki:[9236] trunk/lib/ArchiveCleaner.php

[<var...@us...>]

Revision: 9236
          http://sourceforge.net/p/phpwiki/code/9236
Author:   vargenau
Date:     2014-10-09 18:35:20 +0000 (Thu, 09 Oct 2014)
Log Message:
-----------
Use __construct

Modified Paths:
--------------
    trunk/lib/ArchiveCleaner.php

Modified: trunk/lib/ArchiveCleaner.php
===================================================================
--- trunk/lib/ArchiveCleaner.php	2014-10-09 14:18:34 UTC (rev 9235)
+++ trunk/lib/ArchiveCleaner.php	2014-10-09 18:35:20 UTC (rev 9236)
@@ -21,11 +21,15 @@
 
 class ArchiveCleaner
 {
-    function ArchiveCleaner($expire_params)
+    function __construct($expire_params)
     {
         $this->expire_params = $expire_params;
     }
 
+    /**
+     * @param $revision
+     * @return bool
+     */
     function isMergeable($revision)
     {
         if (!$revision->get('is_minor_edit'))
@@ -52,6 +56,7 @@
         $INFINITY = 0x7fffffff;
 
         $expire = &$this->expire_params;
+        $counter = array();
         foreach (array('major', 'minor', 'author') as $class)
             $counter[$class] = new ArchiveCleaner_Counter($expire[$class]);
         // shortcut to keep all
@@ -97,7 +102,7 @@
  */
 class ArchiveCleaner_Counter
 {
-    function ArchiveCleaner_Counter($params)
+    function __construct($params)
     {
 
         if (!empty($params))

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9452] trunk/lib/ArchiveCleaner.php

[<var...@us...>]

Revision: 9452
          http://sourceforge.net/p/phpwiki/code/9452
Author:   vargenau
Date:     2014-12-19 15:32:20 +0000 (Fri, 19 Dec 2014)
Log Message:
-----------
Update PHP Doc

Modified Paths:
--------------
    trunk/lib/ArchiveCleaner.php

Modified: trunk/lib/ArchiveCleaner.php
===================================================================
--- trunk/lib/ArchiveCleaner.php	2014-12-19 13:37:02 UTC (rev 9451)
+++ trunk/lib/ArchiveCleaner.php	2014-12-19 15:32:20 UTC (rev 9452)
@@ -27,10 +27,10 @@
     }
 
     /**
-     * @param $revision
+     * @param WikiDB_PageRevision $revision
      * @return bool
      */
-    function isMergeable($revision)
+    private function isMergeable($revision)
     {
         if (!$revision->get('is_minor_edit'))
             return false;
@@ -44,21 +44,18 @@
             && $author_id == $previous->get('author_id');
     }
 
-    function cleanDatabase($dbi)
+    /**
+     * @param WikiDB_Page $page
+     */
+    public function cleanPageRevisions($page)
     {
-        $iter = $dbi->getAllPages();
-        while ($page = $iter->next())
-            $this->cleanPageRevisions($page);
-    }
-
-    function cleanPageRevisions($page)
-    {
         $INFINITY = 0x7fffffff;
 
         $expire = &$this->expire_params;
         $counter = array();
-        foreach (array('major', 'minor', 'author') as $class)
-            $counter[$class] = new ArchiveCleaner_Counter($expire[$class]);
+        $counter['major'] = new ArchiveCleaner_Counter($expire['major']);
+        $counter['minor'] = new ArchiveCleaner_Counter($expire['minor']);
+        $counter['author'] = new ArchiveCleaner_Counter($expire['author']);
         // shortcut to keep all
         if (($counter['minor']->min_keep == $INFINITY)
             and ($counter['major']->min_keep == $INFINITY)
@@ -134,7 +131,11 @@
 
     }
 
-    function computeAge($revision)
+    /**
+     * @param WikiDB_PageRevision $revision
+     * @return float|int
+     */
+    private function computeAge($revision)
     {
         $supplanted = $revision->get('_supplanted');
 
@@ -160,6 +161,10 @@
         return ($this->now - $supplanted) / (24 * 3600);
     }
 
+    /**
+     * @param WikiDB_PageRevision $revision
+     * @return bool
+     */
     function keep($revision)
     {
         $INFINITY = 0x7fffffff;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.