Version 5.0.0 beta 4

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

@@ -68,9 +68,9 @@ class Vanilla extends Software
 	/**
 	 * Software Name
 	 *
-	 * @return	string
+	 * @return    string
 	 */
-	public static function softwareName()
+	public static function softwareName(): string
 	{
 		/* Child classes must override this method */
 		return "Vanilla (3.x)";
@@ -79,9 +79,9 @@ class Vanilla extends Software
 	/**
 	 * Software Key
 	 *
-	 * @return	string
+	 * @return    string
 	 */
-	public static function softwareKey()
+	public static function softwareKey(): string
 	{
 		/* Child classes must override this method */
 		return "vanilla";
@@ -90,9 +90,9 @@ class Vanilla extends Software
 	/**
 	 * Requires Parent
 	 *
-	 * @return	boolean
+	 * @return    boolean
 	 */
-	public static function requiresParent()
+	public static function requiresParent(): bool
 	{
 		return TRUE;
 	}
@@ -100,9 +100,9 @@ class Vanilla extends Software
 	/**
 	 * Possible Parent Conversions
 	 *
-	 * @return	array
+	 * @return    array|null
 	 */
-	public static function parents()
+	public static function parents(): ?array
 	{
 		return array( 'core' => array( 'vanilla' ) );
 	}
@@ -110,9 +110,9 @@ class Vanilla 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(
@@ -142,9 +142,9 @@ class Vanilla extends Software
 	/**
 	 * Allows software to add additional menu row options
 	 *
-	 * @return	array
+	 * @return    array
 	 */
-	public function extraMenuRows()
+	public function extraMenuRows(): array
 	{
 		$rows = array();
 		$rows['convertForumsPosts2'] = array(
@@ -164,13 +164,13 @@ class Vanilla 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 )
 		{
@@ -197,9 +197,9 @@ class Vanilla extends Software
 	/**
 	 * Can we convert passwords from this software.
 	 *
-	 * @return 	boolean
+	 * @return    boolean
 	 */
-	public static function loginEnabled()
+	public static function loginEnabled(): bool
 	{
 		return TRUE;
 	}
@@ -207,9 +207,9 @@ class Vanilla 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(
 			'convertForumsForums',
@@ -221,10 +221,10 @@ class Vanilla 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();
 
@@ -293,9 +293,9 @@ class Vanilla 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', 'RebuildContainerCounts', array( 'class' => 'IPS\forums\Forum', 'count' => 0 ), 4, array( 'class' ) );
@@ -699,10 +699,10 @@ class Vanilla extends Software
 	/**
 	 * Check if we can redirect the legacy URLs from this software to the new locations
 	 *
-	 * @return	NULL|Url
+	 * @return    Url|NULL
 	 * @note	Forums and profiles don't use an ID in the URL. While we may be able to somehow cross reference this with our SEO slug, it wouldn't be reliable.
 	 */
-	public function checkRedirects()
+	public function checkRedirects(): ?Url
 	{
 		$url = Request::i()->url();