Version 5.0.0 beta 4

applications/convert/sources/Software/Gallery/Invisioncommunity.php

@@ -45,12 +45,12 @@ class Invisioncommunity extends Software
 	/**
 	 * @brief    Whether the versions of IPS4 match
 	 */
-	public static $versionMatch = FALSE;
+	public static bool $versionMatch = FALSE;
 
 	/**
 	 * @brief    Whether the database has been required
 	 */
-	public static $dbNeeded = FALSE;
+	public static bool $dbNeeded = FALSE;
 
 	/**
 	 * Constructor
@@ -60,12 +60,12 @@ class Invisioncommunity extends Software
 	 * @return    void
 	 * @throws    InvalidArgumentException
 	 */
-	public function __construct( App $app, $needDB = TRUE )
+	public function __construct( App $app, bool $needDB = TRUE )
 	{
 		/* Set filename obscuring flag */
 		Library::$obscureFilenames = FALSE;
 
-		$return = parent::__construct( $app, $needDB );
+		parent::__construct( $app, $needDB );
 
 		if ( $needDB )
 		{
@@ -86,8 +86,6 @@ class Invisioncommunity extends Software
 			/* Get parent sauce */
 			$this->parent = $this->app->_parent->getSource();
 		}
-
-		return $return;
 	}
 
 	/**
@@ -95,7 +93,7 @@ class Invisioncommunity extends Software
 	 *
 	 * @return    string
 	 */
-	public static function softwareName()
+	public static function softwareName(): string
 	{
 		/* Child classes must override this method */
 		return 'Invision Community (' . Application::load( 'core' )->version . ')';
@@ -106,7 +104,7 @@ class Invisioncommunity extends Software
 	 *
 	 * @return    string
 	 */
-	public static function softwareKey()
+	public static function softwareKey(): string
 	{
 		/* Child classes must override this method */
 		return "invisioncommunity";
@@ -115,9 +113,9 @@ class Invisioncommunity extends Software
 	/**
 	 * Content we can convert from this software.
 	 *
-	 * @return	array
+	 * @return    array|null
 	 */
-	public static function canConvert()
+	public static function canConvert(): ?array
 	{
 		if( !static::$versionMatch AND static::$dbNeeded )
 		{
@@ -163,9 +161,9 @@ class Invisioncommunity extends Software
 	/**
 	 * Requires Parent
 	 *
-	 * @return	boolean
+	 * @return    boolean
 	 */
-	public static function requiresParent()
+	public static function requiresParent(): bool
 	{
 		return TRUE;
 	}
@@ -173,9 +171,9 @@ class Invisioncommunity extends Software
 	/**
 	 * Possible Parent Conversions
 	 *
-	 * @return	array
+	 * @return    array|null
 	 */
-	public static function parents()
+	public static function parents(): ?array
 	{
 		return array( 'core' => array( 'invisioncommunity' ) );
 	}
@@ -183,9 +181,9 @@ class Invisioncommunity 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',
@@ -196,10 +194,10 @@ class Invisioncommunity extends Software
 	/**
 	 * Get More Information
 	 *
-	 * @param	string	$method	Method name
-	 * @return	array
+	 * @param string $method	Method name
+	 * @return    array|null
 	 */
-	public function getMoreInfo( $method )
+	public function getMoreInfo( string $method ): ?array
 	{
 		$return = array();
 
@@ -212,7 +210,7 @@ class Invisioncommunity extends Software
 				$return[ $method ] = array(
 					'upload_path'				=> array(
 						'field_class'		=> 'IPS\\Helpers\\Form\\Text',
-						'field_default'		=> isset( $this->parent->app->_session['more_info']['convertEmoticons']['upload_path'] ) ? $this->parent->app->_session['more_info']['convertEmoticons']['upload_path'] : NULL,
+						'field_default'		=> $this->parent->app->_session['more_info']['convertEmoticons']['upload_path'] ?? NULL,
 						'field_required'	=> TRUE,
 						'field_extra'		=> array(),
 						'field_hint'		=> Member::loggedIn()->language()->addToStack('convert_invision_upload_path'),
@@ -228,9 +226,9 @@ class Invisioncommunity 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( 'convert', 'RebuildGalleryImages', array( 'app' => $this->app->app_id ), 2, array( 'app' ) );
@@ -251,7 +249,7 @@ class Invisioncommunity extends Software
 	 *
 	 * @return	void
 	 */
-	public function convertAttachments()
+	public function convertAttachments() : void
 	{
 		$libraryClass = $this->getLibrary();
 		$libraryClass::setKey( 'attach_id' );
@@ -293,7 +291,7 @@ class Invisioncommunity extends Software
 	 *
 	 * @return	void
 	 */
-	public function convertGalleryAlbums()
+	public function convertGalleryAlbums() : void
 	{
 		$libraryClass = $this->getLibrary();
 		$libraryClass::setKey( 'album_id' );
@@ -338,7 +336,7 @@ class Invisioncommunity extends Software
 	 *
 	 * @return	void
 	 */
-	public function convertGalleryAlbumComments()
+	public function convertGalleryAlbumComments() : void
 	{
 		$libraryClass = $this->getLibrary();
 		$libraryClass::setKey( 'comment_id' );
@@ -371,7 +369,7 @@ class Invisioncommunity extends Software
 	 *
 	 * @return	void
 	 */
-	public function convertGalleryAlbumReviews()
+	public function convertGalleryAlbumReviews() : void
 	{
 		$libraryClass = $this->getLibrary();
 		$libraryClass::setKey( 'review_id' );
@@ -404,7 +402,7 @@ class Invisioncommunity extends Software
 	 *
 	 * @return	void
 	 */
-	public function convertGalleryCategories()
+	public function convertGalleryCategories() : void
 	{
 		$libraryClass = $this->getLibrary();
 		$libraryClass::setKey( 'category_id' );
@@ -444,7 +442,7 @@ class Invisioncommunity extends Software
 	 *
 	 * @return	void
 	 */
-	public function convertGalleryComments()
+	public function convertGalleryComments() : void
 	{
 		$libraryClass = $this->getLibrary();
 		$libraryClass::setKey( 'comment_id' );
@@ -477,7 +475,7 @@ class Invisioncommunity extends Software
 	 *
 	 * @return	void
 	 */
-	public function convertGalleryImages()
+	public function convertGalleryImages() : void
 	{
 		$libraryClass = $this->getLibrary();
 		$libraryClass::setKey( 'image_id' );
@@ -527,9 +525,9 @@ class Invisioncommunity extends Software
 	/**
 	 * Check if we can redirect the legacy URLs from this software to the new locations
 	 *
-	 * @return	NULL|Url
+	 * @return    Url|NULL
 	 */
-	public function checkRedirects()
+	public function checkRedirects(): ?Url
 	{
 		$url = Request::i()->url();