Version 5.0.0 beta 4

applications/convert/sources/Software/Cms/Xenfororm.php

@@ -36,19 +36,19 @@ class Xenfororm extends Software
 	/**
 	 * @brief	The similarities between XF1 and XF2 are close enough that we can use the same converter
 	 */
-	public static $isLegacy = NULL;
+	public static ?bool $isLegacy = NULL;
 
 	/**
 	 * @brief	XF2 Has prefixes on RM tables
 	 */
-	public static $tablePrefix = '';
+	public static string $tablePrefix = '';
 
 	/**
 	 * Software Name
 	 *
-	 * @return	string
+	 * @return    string
 	 */
-	public static function softwareName()
+	public static function softwareName(): string
 	{
 		/* Child classes must override this method */
 		return "XenForo Resource Manager Articles (1.5.x/2.0.x/2.1.x/2.2.x)";
@@ -62,9 +62,9 @@ class Xenfororm extends Software
 	 * @return	void
 	 * @throws	InvalidArgumentException
 	 */
-	public function __construct( App $app, $needDB=TRUE )
+	public function __construct( App $app, bool $needDB=TRUE )
 	{
-		$return = parent::__construct( $app, $needDB );
+		parent::__construct( $app, $needDB );
 
 		if ( $needDB )
 		{
@@ -88,16 +88,14 @@ class Xenfororm extends Software
 			}
 			catch( \Exception $e ) {} # If we can't query, we won't be able to do anything anyway
 		}
-
-		return $return;
 	}
 	
 	/**
 	 * Software Key
 	 *
-	 * @return	string
+	 * @return    string
 	 */
-	public static function softwareKey()
+	public static function softwareKey(): string
 	{
 		/* Child classes must override this method */
 		return "xenfororm";
@@ -106,9 +104,9 @@ class Xenfororm extends Software
 	/**
 	 * Content we can convert from this software. 
 	 *
-	 * @return	array
+	 * @return    array|null
 	 */
-	public static function canConvert()
+	public static function canConvert(): ?array
 	{
 		return array(
 			'convertCmsDatabases'			=> array(
@@ -129,32 +127,30 @@ class Xenfororm extends Software
 	/**
 	 * Count Source Rows for a specific step
 	 *
-	 * @param	string		$table		The table containing the rows to count.
-	 * @param	array|NULL	$where		WHERE clause to only count specific rows, or NULL to count all.
-	 * @param	bool		$recache	Skip cache and pull directly (updating cache)
-	 * @return	integer
+	 * @param string $table		The table containing the rows to count.
+	 * @param string|array|NULL $where		WHERE clause to only count specific rows, or NULL to count all.
+	 * @param bool $recache	Skip cache and pull directly (updating cache)
+	 * @return    integer
 	 * @throws	\IPS\convert\Exception
 	 */
-	public function countRows( $table, $where=NULL, $recache=FALSE )
+	public function countRows( string $table, string|array|null $where=NULL, bool $recache=FALSE ): int
 	{
 		switch( $table )
 		{
 			case 'cms_databases':
 				return 1;
-				break;
 				
 			default:
 				return parent::countRows( $table, $where, $recache );
-				break;
 		}
 	}
 	
 	/**
 	 * Uses Prefix
 	 *
-	 * @return	bool
+	 * @return    bool
 	 */
-	public static function usesPrefix()
+	public static function usesPrefix(): bool
 	{
 		return FALSE;
 	}
@@ -162,9 +158,9 @@ class Xenfororm extends Software
 	/**
 	 * Requires Parent
 	 *
-	 * @return	boolean
+	 * @return    boolean
 	 */
-	public static function requiresParent()
+	public static function requiresParent(): bool
 	{
 		return TRUE;
 	}
@@ -172,9 +168,9 @@ class Xenfororm extends Software
 	/**
 	 * Possible Parent Conversions
 	 *
-	 * @return	array
+	 * @return    array|null
 	 */
-	public static function parents()
+	public static function parents(): ?array
 	{
 		return array( 'core' => array( 'xenforo' ) );
 	}
@@ -184,7 +180,7 @@ class Xenfororm extends Software
 	 *
 	 * @return	void
 	 */
-	public function convertCmsDatabases()
+	public function convertCmsDatabases() : void
 	{
 		$libraryClass = $this->getLibrary();
 		
@@ -235,7 +231,7 @@ class Xenfororm extends Software
 	 *
 	 * @return	void
 	 */
-	public function convertCmsDatabaseCategories()
+	public function convertCmsDatabaseCategories() : void
 	{
 		$libraryClass = $this->getLibrary();
 		
@@ -254,7 +250,7 @@ class Xenfororm extends Software
 			$info = array(
 				'category_id'			=> $row['resource_category_id'],
 				'category_database_id'	=> 1,
-				'category_name'			=> isset( $row['category_title'] ) ? $row['category_title'] : $row['title'],
+				'category_name'			=> $row['category_title'] ?? $row['title'],
 				'category_parent_id'	=> $row['parent_category_id'],
 				'category_position'		=> $row['display_order'],
 				'category_fields'		=> array( 'resource_title', 'resource_tagline', 'resource_content' ),
@@ -271,7 +267,7 @@ class Xenfororm extends Software
 	 *
 	 * @return	void
 	 */
-	public function convertCmsDatabaseRecords()
+	public function convertCmsDatabaseRecords() : void
 	{
 		$libraryClass = $this->getLibrary();
 		
@@ -319,9 +315,9 @@ class Xenfororm extends Software
 	/**
 	 * Finish - Adds everything it needs to the queues and clears data store
 	 *
-	 * @return	array		Messages to display
+	 * @return    array        Messages to display
 	 */
-	public function finish()
+	public function finish(): array
 	{
 		try
 		{