Version 5.0.0 beta 4

applications/convert/sources/Software/Core/Expressionengine.php

@@ -49,9 +49,9 @@ class Expressionengine extends Software
 	/**
 	 * Software Name
 	 *
-	 * @return	string
+	 * @return    string
 	 */
-	public static function softwareName()
+	public static function softwareName(): string
 	{
 		return "Expression Engine";
 	}
@@ -59,9 +59,9 @@ class Expressionengine extends Software
 	/**
 	 * Software Key
 	 *
-	 * @return	string
+	 * @return    string
 	 */
-	public static function softwareKey()
+	public static function softwareKey(): string
 	{
 		return 'expressionengine';
 	}
@@ -69,9 +69,9 @@ class Expressionengine 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(
 			'convertProfileFields'		=> array(
@@ -109,9 +109,9 @@ class Expressionengine extends Software
 	/**
 	 * Allows software to add additional menu row options
 	 *
-	 * @return	array
+	 * @return    array
 	 */
-	public function extraMenuRows()
+	public function extraMenuRows(): array
 	{
 		$rows = array();
 		$rows['convertPmAttachments'] = array(
@@ -130,9 +130,9 @@ class Expressionengine extends Software
 	/**
 	 * Can we convert passwords from this software.
 	 *
-	 * @return 	boolean
+	 * @return    boolean
 	 */
-	public static function loginEnabled()
+	public static function loginEnabled(): bool
 	{
 		return TRUE;
 	}
@@ -140,9 +140,9 @@ class Expressionengine extends Software
 	/**
 	 * Can we convert settings?
 	 *
-	 * @return	boolean
+	 * @return    boolean
 	 */
-	public static function canConvertSettings()
+	public static function canConvertSettings(): bool
 	{
 		return FALSE;
 	}
@@ -150,9 +150,9 @@ class Expressionengine extends Software
 	/**
 	 * List of Conversion Methods that require more information
 	 *
-	 * @return	array
+	 * @return    array
 	 */
-	public static function checkConf()
+	public static function checkConf(): array
 	{
 		return array(
 			'convertAttachments',
@@ -166,9 +166,9 @@ class Expressionengine 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 post
+	 * @param	string|null		$className Classname passed by post-conversion rebuild
+	 * @param	int|null		$contentId ID passed by post-conversion rebuild
 	 * @return	string			The converted post
 	 */
 	public static function fixPostData( string $post, ?string $className=null, ?int $contentId=null ): string
@@ -179,10 +179,10 @@ class Expressionengine 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();
 
@@ -311,9 +311,9 @@ class Expressionengine extends Software
 	/**
 	 * Finish
 	 *
-	 * @return	array	Messages to display
+	 * @return    array    Messages to display
 	 */
-	public function finish()
+	public function finish(): array
 	{
 		/* Search Index Rebuild */
 		Index::i()->rebuild();
@@ -344,7 +344,7 @@ class Expressionengine extends Software
 	 *
 	 * @return	void
 	 */
-	public function convertAttachments()
+	public function convertAttachments() : void
 	{
 		$libraryClass = $this->getLibrary();
 
@@ -389,8 +389,7 @@ class Expressionengine extends Software
 					Db::i()->update( 'core_members', array( 'signature' => $signature ), array( "member_id=?", $memberId ) );
 				}
 			}
-			catch( UnderflowException $e ) {}
-			catch( OutOfRangeException $e ) {}
+			catch( UnderflowException|OutOfRangeException $e ) {}
 
 			$libraryClass->setLastKeyValue( $row['member_id'] );
 		}
@@ -401,7 +400,7 @@ class Expressionengine extends Software
 	 *
 	 * @return	void
 	 */
-	public function convertProfileFields()
+	public function convertProfileFields() : void
 	{
 		$libraryClass = $this->getLibrary();
 
@@ -432,7 +431,7 @@ class Expressionengine extends Software
 	 *
 	 * @return	void
 	 */
-	public function convertGroups()
+	public function convertGroups() : void
 	{
 		$libraryClass = $this->getLibrary();
 
@@ -473,7 +472,7 @@ class Expressionengine extends Software
 	 *
 	 * @return	void
 	 */
-	public function convertMembers()
+	public function convertMembers() : void
 	{
 		$libraryClass = $this->getLibrary();
 
@@ -579,7 +578,7 @@ class Expressionengine extends Software
 	 *
 	 * @return	void
 	 */
-	public function convertPrivateMessages()
+	public function convertPrivateMessages() : void
 	{
 		$libraryClass = $this->getLibrary();
 
@@ -635,7 +634,7 @@ class Expressionengine extends Software
 	 *
 	 * @return	void
 	 */
-	public function convertPrivateMessageReplies()
+	public function convertPrivateMessageReplies() : void
 	{
 		$libraryClass = $this->getLibrary();
 
@@ -662,7 +661,7 @@ class Expressionengine extends Software
 	 *
 	 * @return	void
 	 */
-	public function convertPmAttachments()
+	public function convertPmAttachments() : void
 	{
 		$libraryClass = $this->getLibrary();
 
@@ -708,8 +707,7 @@ class Expressionengine extends Software
 					Db::i()->update( 'core_message_posts', array( 'msg_post' => $message ), array( "msg_id=?", $pmId ) );
 				}
 			}
-			catch( UnderflowException $e ) {}
-			catch( OutOfRangeException $e ) {}
+			catch( UnderflowException|OutOfRangeException $e ) {}
 
 			$libraryClass->setLastKeyValue( $row['attachment_id'] );
 		}
@@ -718,9 +716,9 @@ class Expressionengine 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
 	{
 		/* If we can't access profiles, don't bother trying to redirect */
 		if( !Member::loggedIn()->canAccessModule( Module::get( 'core', 'members' ) ) )
@@ -753,7 +751,7 @@ class Expressionengine extends Software
 	 * @param	string			$password		Password from form
 	 * @return	bool
 	 */
-	public static function login( $member, $password )
+	public static function login( Member $member, string $password ) : bool
 	{
 		$length = strlen( $member->conv_password );
 		$providedHash = FALSE;
@@ -778,6 +776,6 @@ class Expressionengine extends Software
 			break;
 		}
 
-		return ( Login::compareHashes( $member->conv_password, $providedHash ) ) ? TRUE : FALSE;
+		return Login::compareHashes( $member->conv_password, $providedHash );
 	}
 }