Version 5.0.0 beta 7

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

@@ -17,7 +17,7 @@ use DomainException;
 use Exception;
 use IPS\Content;
 use IPS\convert\Software;
-use IPS\convert\Software\Core\Mybb;
+use IPS\convert\Software\Core\Mybb as MybbCore;
 use IPS\Db;
 use IPS\Http\Url;
 use IPS\Member;
@@ -209,14 +209,14 @@ class Mybb 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 Mybb::fixPostData( $post, $className, $contentId );
+		return MybbCore::fixPostData( $post, $className, $contentId );
 	}
 
 	/**
@@ -224,7 +224,7 @@ class Mybb extends Software
 	 *
 	 * @return	void
 	 */
-	public function convertForumsForums()
+	public function convertForumsForums(): void
 	{
 		$libraryClass = $this->getLibrary();
 		
@@ -283,7 +283,7 @@ class Mybb extends Software
 	 *
 	 * @return	void
 	 */
-	public function convertForumsTopics()
+	public function convertForumsTopics(): void
 	{
 		$libraryClass = $this->getLibrary();
 		
@@ -380,10 +380,7 @@ class Mybb extends Software
 						$this->db->select( 'fid', 'threads', array( "tid=?", $moved[1] ) )->first()
 					);
 				}
-				catch( UnderflowException $e )
-				{
-					$moved_to = NULL;
-				}
+				catch( UnderflowException $e ){}
 			}
 			
 			$info = array(
@@ -473,7 +470,7 @@ class Mybb extends Software
 	 *
 	 * @return	void
 	 */
-	public function convertForumsPosts()
+	public function convertForumsPosts(): void
 	{
 		$libraryClass = $this->getLibrary();
 		
@@ -512,7 +509,7 @@ class Mybb extends Software
 				'author_name'		=> $row['username'],
 				'ip_address'		=> $row['ipaddress'],
 				'post_date'			=> $row['dateline'],
-				'queued'			=> $queued,
+				'queued'			=> $queued ?? 0,
 				'post_edit_reason'	=> $row['editreason'],
 			);
 
@@ -574,7 +571,7 @@ class Mybb extends Software
 	 *
 	 * @return	void
 	 */
-	public function convertAttachments()
+	public function convertAttachments(): void
 	{
 		$libraryClass = $this->getLibrary();
 		
@@ -629,9 +626,8 @@ class Mybb extends Software
 					}
 				}
 			}
-			catch( UnderflowException $e ) {}
-			catch( OutOfRangeException $e ) {}
-			
+			catch( UnderflowException|OutOfRangeException $e ) {}
+
 			$libraryClass->setLastKeyValue( $row['aid'] );
 		}
 	}