Version 5.0.0 beta 4

applications/convert/sources/Login.php

@@ -21,6 +21,7 @@ use IPS\convert\Software\Core\Vbulletin;
 use IPS\convert\Software\Core\Vbulletin5;
 use IPS\convert\Software\Core\Wordpress;
 use IPS\Db;
+use IPS\Db\Exception as DbException;
 use IPS\Events\Event;
 use IPS\Login as LoginClass;
 use IPS\Login\Exception;
@@ -29,6 +30,7 @@ use IPS\Login\Handler\UsernamePasswordHandler;
 use IPS\Member;
 use IPS\Patterns\ActiveRecordIterator;
 use IPS\Request;
+use SoapClient;
 use function count;
 use function defined;
 use function strlen;
@@ -75,7 +77,7 @@ class Login extends Handler
 			$member = new Member;
 			$member->email = $usernameOrEmail;
 
-			throw new Exception( Member::loggedIn()->language()->addToStack( 'login_err_no_account', FALSE, array() ), Exception::NO_ACCOUNT, NULL, $member );
+			throw new Exception( Member::loggedIn()->language()->addToStack( 'login_err_no_account', FALSE ), Exception::NO_ACCOUNT, NULL, $member );
 		}
 
 		/* Get member(s) */
@@ -101,7 +103,7 @@ class Login extends Handler
 			$member = new Member;
 			$member->email = $usernameOrEmail;
 
-			throw new Exception( Member::loggedIn()->language()->addToStack( 'login_err_no_account', FALSE, array() ), Exception::NO_ACCOUNT, NULL, $member );
+			throw new Exception( Member::loggedIn()->language()->addToStack( 'login_err_no_account', FALSE ), Exception::NO_ACCOUNT, NULL, $member );
 		}
 
 		/* Table switcher for new converters */
@@ -115,7 +117,7 @@ class Login extends Handler
 				}
 			}
 		}
-		catch( \IPS\Db\Exception $e )
+		catch( DbException $e )
 		{
 			/* Converter tables no longer exist */
 			if( $e->getCode() == 1146 )
@@ -125,13 +127,13 @@ class Login extends Handler
 		}
 
 		/* Still here? Throw a password incorrect exception */
-		throw new Exception( Member::loggedIn()->language()->addToStack( 'login_err_bad_password', FALSE, array() ), Exception::BAD_PASSWORD, NULL, isset( $member ) ? $member : NULL );
+		throw new Exception( Member::loggedIn()->language()->addToStack( 'login_err_bad_password', FALSE ), Exception::BAD_PASSWORD, NULL, $member ?? NULL );
 	}
 
 	/**
 	 *	@brief		Convert app cache
 	 */
-	protected static $_apps;
+	protected static ?ActiveRecordIterator $_apps;
 
 	/**
 	 * Authenticate
@@ -195,7 +197,7 @@ class Login extends Handler
 				$member->save();
 				Event::fire( 'onPassChange', $member, array( $password ) );
 
-				return $member;
+				return true;
 			}
 		}
 
@@ -231,7 +233,7 @@ class Login extends Handler
 	 * @param	object		$newPassword		New Password wrapped in an object that can be cast to a string so it doesn't show in any logs
 	 * @return	void
 	 */
-	public function changePassword( Member $member, $newPassword )
+	public function changePassword( Member $member, object $newPassword ) : void
 	{
 		$member->setLocalPassword( $newPassword );
 		$member->save();
@@ -255,7 +257,7 @@ class Login extends Handler
 	 * @param	string	$password	Password from form
 	 * @return	bool
 	 */
-	protected function aef( $member, $password )
+	protected function aef( Member $member, string $password ) : bool
 	{
 		if ( LoginClass::compareHashes( $member->conv_password, md5( $member->misc . $password ) ) )
 		{
@@ -274,7 +276,7 @@ class Login extends Handler
 	 * @param	string	$password	Password from form
 	 * @return	bool
 	 */
-	protected function bbpressstandalone( $member, $password )
+	protected function bbpressstandalone( Member $member, string $password ) : bool
 	{
 		return $this->bbpress( $member, $password );
 	}
@@ -286,7 +288,7 @@ class Login extends Handler
 	 * @param	string	$password	Password from form
 	 * @return	bool
 	 */
-	protected function bbpress( $member, $password )
+	protected function bbpress( Member $member, string $password ) : bool
 	{
 		$success = false;
 		$password = html_entity_decode( $password );
@@ -294,7 +296,7 @@ class Login extends Handler
 
 		if ( strlen( $hash ) == 32 )
 		{
-			$success = ( bool ) ( LoginClass::compareHashes( $member->conv_password, md5( $password ) ) );
+			$success = ( LoginClass::compareHashes( $member->conv_password, md5( $password ) ) );
 		}
 
 		// Nope, not md5.
@@ -332,7 +334,7 @@ class Login extends Handler
 	 * @param	string	$password	Password from form
 	 * @return	bool
 	 */
-	protected function bbpress23( $member, $password )
+	protected function bbpress23( Member $member, string $password ) : bool
 	{
 		return $this->bbpress( $member, $password );
 	}
@@ -344,7 +346,7 @@ class Login extends Handler
 	 * @param	string	$password	Password from form
 	 * @return	bool
 	 */
-	protected function cs( $member, $password )
+	protected function cs( Member $member, string $password ) : bool
 	{
 		$encodedHashPass = base64_encode( pack( "H*", sha1( base64_decode( $member->misc ) . $password ) ) );
 
@@ -365,7 +367,7 @@ class Login extends Handler
 	 * @param	string	$password	Password from form
 	 * @return	bool
 	 */
-	protected function csauth( $member, $password )
+	protected function csauth( Member $member, string $password ) : bool
 	{
 		$wsdl = 'https://internal.auth.com/Service.asmx?wsdl';
 		$dest = 'https://interal.auth.com/Service.asmx';
@@ -383,8 +385,7 @@ class Login extends Handler
 				case 'SUCCESS' :
 					return TRUE;
 				case 'WRONG_AUTH' :
-					return FALSE;
-				default :
+				default:
 					return FALSE;
 			}
 		}
@@ -401,7 +402,7 @@ class Login extends Handler
 	 * @param	string	$password	Password from form
 	 * @return	bool
 	 */
-	protected function discuz( $member, $password )
+	protected function discuz( Member $member, string $password ) : bool
 	{
 		if ( LoginClass::compareHashes( $member->conv_password, md5( md5( $password ) . $member->misc ) ) )
 		{
@@ -417,7 +418,7 @@ class Login extends Handler
 	 * @param	string	$password	Password from form
 	 * @return	bool
 	 */
-	protected function fudforum( $member, $password )
+	protected function fudforum( Member $member, string $password ) : bool
 	{
 		$success = false;
 		$single_md5_pass = md5( $password );
@@ -425,11 +426,11 @@ class Login extends Handler
 
 		if ( strlen( $hash ) == 40 )
 		{
-			$success = ( LoginClass::compareHashes( $member->conv_password, sha1( $member->misc . sha1( $password ) ) ) ) ? TRUE : FALSE;
+			$success = LoginClass::compareHashes( $member->conv_password, sha1( $member->misc . sha1( $password ) ) );
 		}
 		else
 		{
-			$success = ( LoginClass::compareHashes( $member->conv_password, $single_md5_pass ) ) ? TRUE : FALSE;
+			$success = LoginClass::compareHashes( $member->conv_password, $single_md5_pass );
 		}
 
 		return $success;
@@ -442,7 +443,7 @@ class Login extends Handler
 	 * @param	string	$password	Password from form
 	 * @return	bool
 	 */
-	protected function fusionbb( $member, $password )
+	protected function fusionbb( Member $member, string $password ) : bool
 	{
 		/* FusionBB Has multiple methods that can be used to check a hash, so we need to cycle through them */
 
@@ -474,7 +475,7 @@ class Login extends Handler
 	 * @param	string	$password	Password from form
 	 * @return	bool
 	 */
-	protected function ikonboard( $member, $password )
+	protected function ikonboard( Member $member, string $password ) : bool
 	{
 		if ( LoginClass::compareHashes( $member->conv_password, crypt( $password, $member->misc ) ) )
 		{
@@ -497,7 +498,7 @@ class Login extends Handler
 	 * @param	string	$password	Password from form
 	 * @return	bool
 	 */
-	protected function kunena( $member, $password )
+	protected function kunena( Member $member, string $password ) : bool
 	{
 		// Kunena authenticates using internal Joomla functions.
 		// This is required, however, if the member only converts from
@@ -512,7 +513,7 @@ class Login extends Handler
 	 * @param	string	$password	Password from form
 	 * @return	bool
 	 */
-	protected function phpbblegacy( $member, $password )
+	protected function phpbblegacy( Member $member, string $password ) : bool
 	{
 		return Phpbb::login( $member, $password );
 	}
@@ -524,7 +525,7 @@ class Login extends Handler
 	 * @param	string	$password	Password from form
 	 * @return	bool
 	 */
-	protected function vb51connect( $member, $password )
+	protected function vb51connect( Member $member, string $password ) : bool
 	{
 		return Vbulletin5::login( $member, $password );
 	}
@@ -536,7 +537,7 @@ class Login extends Handler
 	 * @param	string	$password	Password from form
 	 * @return	bool
 	 */
-	protected function vb5connect( $member, $password )
+	protected function vb5connect( Member $member, string $password ) : bool
 	{
 		return Vbulletin5::login( $member, $password );
 	}
@@ -548,7 +549,7 @@ class Login extends Handler
 	 * @param	string	$password	Password from form
 	 * @return	bool
 	 */
-	protected function vbulletinlegacy( $member, $password )
+	protected function vbulletinlegacy( Member $member, string $password ) : bool
 	{
 		return Vbulletin::login( $member, $password );
 	}
@@ -560,7 +561,7 @@ class Login extends Handler
 	 * @param	string	$password	Password from form
 	 * @return	bool
 	 */
-	protected function vbulletinlegacy36( $member, $password )
+	protected function vbulletinlegacy36( Member $member, string $password ) : bool
 	{
 		return Vbulletin::login( $member, $password );
 	}
@@ -572,7 +573,7 @@ class Login extends Handler
 	 * @param	string	$password	Password from form
 	 * @return	bool
 	 */
-	protected function smflegacy( $member, $password )
+	protected function smflegacy( Member $member, string $password ) : bool
 	{
 		if ( LoginClass::compareHashes( $member->conv_password, sha1( mb_strtolower( $member->name ) . $password ) ) )
 		{
@@ -591,7 +592,7 @@ class Login extends Handler
 	 * @param	string	$password	Password from form
 	 * @return	bool
 	 */
-	protected function telligentcs( $member, $password )
+	protected function telligentcs( Member $member, string $password ) : bool
 	{
 		return $this->cs( $member, $password );
 	}
@@ -603,7 +604,7 @@ class Login extends Handler
 	 * @param	string	$password	Password from form
 	 * @return	bool
 	 */
-	protected function woltlab( $member, $password )
+	protected function woltlab( Member $member, string $password ) : bool
 	{
 		$testHash = FALSE;
 
@@ -633,7 +634,7 @@ class Login extends Handler
 	 * @param	string	$password	Password from form
 	 * @return	bool
 	 */
-	protected function woltlablegacy( $member, $password )
+	protected function woltlablegacy( Member $member, string $password ) : bool
 	{
 		if ( LoginClass::compareHashes( $member->conv_password, sha1( $member->misc . sha1( $member->misc . sha1( $password ) ) ) ) )
 		{
@@ -652,9 +653,9 @@ class Login extends Handler
 	 * @param	string	$password	Password from form
 	 * @return	bool
 	 */
-	protected function phpfusion( $member, $password )
+	protected function phpfusion( Member $member, string $password ) : bool
 	{
-		return ( bool ) LoginClass::compareHashes( $member->conv_password, md5( md5( $password ) ) );
+		return LoginClass::compareHashes( $member->conv_password, md5( md5( $password ) ) );
 	}
 
 	/**
@@ -664,7 +665,7 @@ class Login extends Handler
 	 * @param	string	$password	Password from form
 	 * @return	bool
 	 */
-	protected function fluxbb( $member, $password )
+	protected function fluxbb( Member $member, string $password ) : bool
 	{
 		$success = false;
 		$hash = $member->conv_password;
@@ -682,7 +683,7 @@ class Login extends Handler
 		}
 		else
 		{
-			$success = ( LoginClass::compareHashes( $hash, md5( $password ) ) ) ? TRUE : FALSE;
+			$success = LoginClass::compareHashes( $hash, md5( $password ) );
 		}
 
 		return $success;
@@ -695,7 +696,7 @@ class Login extends Handler
 	 * @param	string	$password	Password from form
 	 * @return	bool
 	 */
-	protected function simplepress( $member, $password )
+	protected function simplepress( Member $member, string $password ) : bool
 	{
 		return Wordpress::login( $member, $password );
 	}