Version 5.0.0 beta 4

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

@@ -40,9 +40,9 @@ class Joomla extends Software
 	/**
 	 * Software Name
 	 *
-	 * @return	string
+	 * @return    string
 	 */
-	public static function softwareName()
+	public static function softwareName(): string
 	{
 		/* Child classes must override this method */
 		return "Joomla";
@@ -51,9 +51,9 @@ class Joomla extends Software
 	/**
 	 * Software Key
 	 *
-	 * @return	string
+	 * @return    string
 	 */
-	public static function softwareKey()
+	public static function softwareKey(): string
 	{
 		/* Child classes must override this method */
 		return "joomla";
@@ -62,9 +62,9 @@ class Joomla 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(
 			'convertGroups'				=> array(
@@ -81,9 +81,9 @@ class Joomla extends Software
 	/**
 	 * Can we convert passwords from this software.
 	 *
-	 * @return 	boolean
+	 * @return    boolean
 	 */
-	public static function loginEnabled()
+	public static function loginEnabled(): bool
 	{
 		return TRUE;
 	}
@@ -91,9 +91,9 @@ class Joomla 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(
 			'convertGroups'
@@ -103,10 +103,10 @@ class Joomla 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();
 
@@ -144,9 +144,9 @@ class Joomla 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
 	{
 		/* Search Index Rebuild */
 		Index::i()->rebuild();
@@ -166,7 +166,7 @@ class Joomla extends Software
 	 *
 	 * @return 	void
 	 */
-	public function convertGroups()
+	public function convertGroups() : void
 	{
 		$libraryClass = $this->getLibrary();
 		
@@ -202,7 +202,7 @@ class Joomla extends Software
 	 *
 	 * @return 	void
 	 */
-	public function convertMembers()
+	public function convertMembers() : void
 	{
 		$libraryClass = $this->getLibrary();
 		
@@ -254,14 +254,14 @@ class Joomla 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
 	{
 		/* Joomla 3 */
 		if( preg_match( '/^\$2[ay]\$(0[4-9]|[1-2][0-9]|3[0-1])\$[a-zA-Z0-9.\/]{53}/', $member->conv_password ) )
 		{
 			require_once \IPS\ROOT_PATH . "/applications/convert/sources/Login/PasswordHash.php";
 			$ph = new PasswordHash( 8, TRUE );
-			return $ph->CheckPassword( $password, $member->conv_password ) ? TRUE : FALSE;
+			return $ph->CheckPassword( $password, $member->conv_password );
 		}
 
 		/* Joomla 2 */