Don't pass null to parameters where it is deprecated to do so.

Author: nmlgc

TPCParse.php

@@ -69,7 +69,7 @@ public static function parseVer( $str ) {
 	  */
 	public static function parseCSV( &$param ) {
 		$REGEX_CSV = '/\s*,\s*/';
-		$ret = preg_split( $REGEX_CSV, $param, null, PREG_SPLIT_NO_EMPTY );
+		$ret = preg_split( $REGEX_CSV, $param, -1, PREG_SPLIT_NO_EMPTY );
 		if ( count( $ret ) == 1 ) {
 			return $ret[0];
 		} else {
@@ -80,27 +80,27 @@ public static function parseCSV( &$param ) {
 	/**
 	  * Parses a wikitext string into an array of lines.
 	  *
-	  * @param string &$param The string to split.
+	  * @param ?string &$param The string to split.
 	  * @param bool $escape_percents Keep literal percent signs for a printf format string.
 	  * @return array Array of lines.
 	  */
 	public static function parseLines( &$param, $escape_percents = true ) {
 		$REGEX_LINE = '#<br\s*/?>|\n#';
 
 		// Important! Breaks patch stacking otherwise!
-		if ( strlen( $param ) == 0 ) {
+		if ( ( $param === null ) || ( strlen( $param ) == 0 ) ) {
 			return null;
 		}
 		$param = TPCUtil::sanitize( $param, $escape_percents );
 		$tlnotePos = strpos( $param, json_decode( '"\u0014"' ) );
 		if( $tlnotePos !== FALSE ) {
 			$tlnote = substr( $param, $tlnotePos );
 			$regular = substr( $param, 0, $tlnotePos );
-			$ret = preg_split( $REGEX_LINE, $regular, null ) ;
+			$ret = preg_split( $REGEX_LINE, $regular ) ;
 			$ret[ count($ret) - 1] .= preg_replace("#<br\s*/?>#", "", $tlnote);
 			return $ret;
 		}
-		return preg_split( $REGEX_LINE, $param, null );
+		return preg_split( $REGEX_LINE, $param );
 	}
 
 	/**

TPCState.php

@@ -67,10 +67,10 @@ public function getCurFile() {
 	/**
 	  * Removes potentially dangerous stuff from a file name.
 	  *
-	  * @param string $fn File name
+	  * @param string File name
 	  * @return string Sanitized file name
 	  */
-	public static function sanitizeFileName( $fn ) {
+	public static function sanitizeFileName( string $fn ): string {
 		// This _will_ need to be changed once we patch Tasofro games, since they
 		// tend to use Japanese characters in their file names...
 		$ret = preg_replace( '/[^a-z0-9\._\- \/]/i', '', $fn );
@@ -87,9 +87,9 @@ public static function sanitizeFileName( $fn ) {
 	 */
 	public function getFileName( $game, $build, $file ) {
 		// Wave the magic wand
-		$this->curGame = self::sanitizeFileName( $game );
-		$this->curBuild = self::sanitizeFileName( $build );
-		$this->curFile = self::sanitizeFileName( $file );
+		$this->curGame = ( $game ? self::sanitizeFileName( $game ) : null );
+		$this->curBuild = ( $build ? self::sanitizeFileName( $build ) : null );
+		$this->curFile = ( $file ? self::sanitizeFileName( $file ) : null );
 
 		if ( !$this->curFile ) {
 			$fn = $this->curGame . '.js';

hooks/TPCFmtMsg.php

@@ -57,7 +57,7 @@ protected static function renderRuby( &$lines ) {
 
 	public static function onMsg( &$tpcState, &$title, &$temp ) {
 		$code = ( $temp->params['code'] ?? null );
-		if ( !preg_match( self::REGEX_CODE, $code, $m ) ) {
+		if ( ( $code === null ) || !preg_match( self::REGEX_CODE, $code, $m ) ) {
 			return true;
 		}
 		$lang = $title->getPageLanguage();