Version 5.0.0 beta 4

applications/convert/sources/Software/Forums/Vbulletin5.php

@@ -48,9 +48,9 @@ class Vbulletin5 extends Software
 	/**
 	 * Software Name
 	 *
-	 * @return	string
+	 * @return    string
 	 */
-	public static function softwareName()
+	public static function softwareName(): string
 	{
 		/* Child classes must override this method */
 		return "vBulletin Forums (5.x)";
@@ -59,9 +59,9 @@ class Vbulletin5 extends Software
 	/**
 	 * Software Key
 	 *
-	 * @return	string
+	 * @return    string
 	 */
-	public static function softwareKey()
+	public static function softwareKey(): string
 	{
 		/* Child classes must override this method */
 		return "vbulletin5";
@@ -70,9 +70,9 @@ class Vbulletin5 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(
 			'convertForumsForums'	=> array(
@@ -102,9 +102,9 @@ class Vbulletin5 extends Software
 	/**
 	 * Allows software to add additional menu row options
 	 *
-	 * @return	array
+	 * @return    array
 	 */
-	public function extraMenuRows()
+	public function extraMenuRows(): array
 	{
 		$rows = array();
 		$rows['convertAttachments2'] = array(
@@ -123,13 +123,13 @@ class Vbulletin5 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 )
 		{
@@ -172,9 +172,9 @@ class Vbulletin5 extends Software
 	/**
 	 * Requires Parent
 	 *
-	 * @return	boolean
+	 * @return    boolean
 	 */
-	public static function requiresParent()
+	public static function requiresParent(): bool
 	{
 		return TRUE;
 	}
@@ -182,9 +182,9 @@ class Vbulletin5 extends Software
 	/**
 	 * Possible Parent Conversions
 	 *
-	 * @return	array
+	 * @return    array|null
 	 */
-	public static function parents()
+	public static function parents(): ?array
 	{
 		return array( 'core' => array( 'vbulletin5' ) );
 	}
@@ -192,9 +192,9 @@ class Vbulletin5 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
 	{
 		/* Content Rebuilds */
 		Task::queue( 'core', 'RebuildItemCounts', array( 'class' => 'IPS\forums\Topic' ), 2, array( 'class' ) );
@@ -226,9 +226,9 @@ class Vbulletin5 extends Software
 	/**
 	 * List of conversion methods that require additional information
 	 *
-	 * @return	array
+	 * @return    array
 	 */
-	public static function checkConf()
+	public static function checkConf(): array
 	{
 		return array(
 			'convertAttachments', 
@@ -239,10 +239,10 @@ class Vbulletin5 extends Software
 	/**
 	 * Get More Information
 	 *
-	 * @param	string	$method	Conversion method
-	 * @return	array
+	 * @param string $method	Conversion method
+	 * @return    array|null
 	 */
-	public function getMoreInfo( $method )
+	public function getMoreInfo( string $method ): ?array
 	{
 		$return = array();
 		switch( $method )
@@ -1094,10 +1094,10 @@ LINK;
 	/**
 	 * Check if we can redirect the legacy URLs from this software to the new locations
 	 *
-	 * @return	NULL|Url
+	 * @return    Url|NULL
 	 * @note	Forum URLs do not have IDs in them, so we cannot redirect them reliably
 	 */
-	public function checkRedirects()
+	public function checkRedirects(): ?Url
 	{
 		$url = Request::i()->url();