Version 5.0.0 beta 7

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

@@ -18,7 +18,7 @@ use DomainException;
 use Exception;
 use IPS\Content;
 use IPS\convert\Software;
-use IPS\convert\Software\Core\Smf;
+use IPS\convert\Software\Core\Smf as SmfCore;
 use IPS\Db;
 use IPS\Http\Url;
 use IPS\Member;
@@ -141,11 +141,9 @@ class Smf extends Software
 				{
 					throw new \IPS\convert\Exception( sprintf( Member::loggedIn()->language()->get( 'could_not_count_rows' ), $table ) );
 				}
-				break;
 			
 			default:
 				return parent::countRows( $table, $where, $recache );
-				break;
 		}
 	}
 
@@ -230,14 +228,14 @@ class Smf extends Software
 	/**
 	 * Pre-process content for the Invision Community text parser
 	 *
-	 * @param	string			The post
-	 * @param	string|null		Content Classname passed by post-conversion rebuild
-	 * @param	int|null		Content ID passed by post-conversion rebuild
+	 * @param	string $post The post
+	 * @param	string|null $className Content Classname passed by post-conversion rebuild
+	 * @param	int|null $contentId Content ID passed by post-conversion rebuild
 	 * @return	string			The converted post
 	 */
 	public static function fixPostData( string $post, ?string $className=null, ?int $contentId=null ): string
 	{
-		return Smf::fixPostData( $post, $className, $contentId );
+		return SmfCore::fixPostData( $post, $className, $contentId );
 	}
 	
 	/**
@@ -245,7 +243,7 @@ class Smf extends Software
 	 *
 	 * @return	void
 	 */
-	public function convertForumsForums()
+	public function convertForumsForums(): void
 	{
 		$libraryClass = $this->getLibrary();
 		
@@ -266,7 +264,7 @@ class Smf extends Software
 	 *
 	 * @return	void
 	 */
-	public function convertForumsBoards()
+	public function convertForumsBoards(): void
 	{
 		$libraryClass = $this->getLibrary();
 		
@@ -319,7 +317,7 @@ class Smf extends Software
 	 *
 	 * @return	void
 	 */
-	public function convertForumsTopics()
+	public function convertForumsTopics(): void
 	{
 		$libraryClass = $this->getLibrary();
 		
@@ -437,7 +435,7 @@ class Smf extends Software
 	 *
 	 * @return	void
 	 */
-	public function convertForumsPosts()
+	public function convertForumsPosts(): void
 	{
 		$libraryClass = $this->getLibrary();
 		
@@ -466,14 +464,14 @@ class Smf extends Software
 	/**
 	 * @brief	Cached attachment paths
 	 */
-	protected static $paths = NULL;
+	protected static ?array $paths = NULL;
 	
 	/**
 	 * Convert attachments
 	 *
 	 * @return	void
 	 */
-	public function convertAttachments()
+	public function convertAttachments(): void
 	{
 		if ( is_null( static::$paths ) )
 		{