move functions to class

NovemLinguae · May 9, 2024 · abceaa9 · abceaa9
1 parent 5175ceb
commit abceaa9
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 34 deletions.
diff --git a/Task7RFACount/src/RFACount.php b/Task7RFACount/src/RFACount.php
@@ -1,23 +1,44 @@
 <?php
 
-function countRFAs( $wikicode ) {
-	preg_match_all( '/\{\{Wikipedia:Requests for adminship\/[^\}]+\}\}/i', $wikicode, $matches );
+class RFACount {
+	public function doRFA( $wapi, $rfaPageWikitext ) {
+		$count = $this->countRFAs( $rfaPageWikitext );
 
-	// don't count {{Wikipedia:Requests for adminship/Header}} and {{Wikipedia:Requests for adminship/bureaucratship}}
-	$count = count( $matches[0] ) - 2;
+		$wikicodeToWrite =
+	"$count<noinclude>
+	{{Documentation}}
+	</noinclude>";
+		$editSummary = "set RFA count to $count (NovemBot Task 7)";
+		$wapi->edit( 'User:Amalthea/RfX/RfA count', $wikicodeToWrite, $editSummary );
+	}
+
+	public function doRFB( $wapi, $rfaPageWikitext ) {
+		$count = $this->countRFBs( $rfaPageWikitext );
 
-	// if we get an impossible count, just return zero
-	if ( $count < 0 ) {
-		$count = 0;
+		$wikicodeToWrite = $count;
+		$editSummary = "set RFB count to $count (NovemBot Task 7)";
+		$wapi->edit( 'User:Amalthea/RfX/RfB count', $wikicodeToWrite, $editSummary );
 	}
 
-	return $count;
-}
+	private function countRFAs( $wikicode ) {
+		preg_match_all( '/\{\{Wikipedia:Requests for adminship\/[^\}]+\}\}/i', $wikicode, $matches );
+
+		// don't count {{Wikipedia:Requests for adminship/Header}} and {{Wikipedia:Requests for adminship/bureaucratship}}
+		$count = count( $matches[0] ) - 2;
 
-function countRFBs( $wikicode ) {
-	preg_match_all( '/\{\{Wikipedia:Requests for bureaucratship\/[^\}]+\}\}/i', $wikicode, $matches );
+		// if we get an impossible count, just return zero
+		if ( $count < 0 ) {
+			$count = 0;
+		}
 
-	$count = count( $matches[0] );
+		return $count;
+	}
+
+	private function countRFBs( $wikicode ) {
+		preg_match_all( '/\{\{Wikipedia:Requests for bureaucratship\/[^\}]+\}\}/i', $wikicode, $matches );
 
-	return $count;
+		$count = count( $matches[0] );
+
+		return $count;
+	}
 }
diff --git a/Task7RFACount/src/index.php b/Task7RFACount/src/index.php
@@ -1,24 +1,5 @@
 <?php
 
-function doRFA( $wapi, $rfaPageWikitext ) {
-	$count = countRFAs( $rfaPageWikitext );
-
-	$wikicodeToWrite =
-"$count<noinclude>
-{{Documentation}}
-</noinclude>";
-	$editSummary = "set RFA count to $count (NovemBot Task 7)";
-	$wapi->edit( 'User:Amalthea/RfX/RfA count', $wikicodeToWrite, $editSummary );
-}
-
-function doRFB( $wapi, $rfaPageWikitext ) {
-	$count = countRFBs( $rfaPageWikitext );
-
-	$wikicodeToWrite = $count;
-	$editSummary = "set RFB count to $count (NovemBot Task 7)";
-	$wapi->edit( 'User:Amalthea/RfX/RfB count', $wikicodeToWrite, $editSummary );
-}
-
 require_once 'config.php';
 require_once 'css.php';
 require_once 'botclasses.php';
@@ -53,12 +34,13 @@ function doRFB( $wapi, $rfaPageWikitext ) {
 $h = new Helper();
 $eh = new EchoHelper( $h );
 $wapi = new WikiAPIWrapper( $config['wikiUsername'], $config['wikiPassword'], $eh );
+$rfaCount = new RFACount();
 
 $eh->echoAndFlush( "PHP version: " . PHP_VERSION, 'variable' );
 
 $rfaPageWikitext = $wapi->getpage( 'Wikipedia:Requests for adminship' );
 
-doRFA( $wapi, $rfaPageWikitext );
-doRFB( $wapi, $rfaPageWikitext );
+$rfaCount->doRFA( $wapi, $rfaPageWikitext );
+$rfaCount->doRFB( $wapi, $rfaPageWikitext );
 
 $eh->echoAndFlush( '', 'complete' );