Fixed class usage

Toflar · Toflar · commit f7872ee9584a · 2019-06-27T12:23:00.000+02:00
diff --git a/core-bundle/src/Resources/contao/forms/FormPassword.php b/core-bundle/src/Resources/contao/forms/FormPassword.php
@@ -142,7 +142,7 @@ protected function validator($varInput)
 
 			/** @var EncoderFactoryInterface $encoderFactory */
 			$encoderFactory = System::getContainer()->get('security.encoder_factory');
-			$encoder = $encoderFactory->getEncoder(BackendUser::class);
+			$encoder = $encoderFactory->getEncoder(FrontendUser::class);
 
 			return $encoder->encodePassword($varInput, null);
 		}
diff --git a/core-bundle/src/Resources/contao/library/Contao/Encryption.php b/core-bundle/src/Resources/contao/library/Contao/Encryption.php
@@ -172,7 +172,7 @@ public static function hash($strPassword)
 	{
 		/** @var EncoderFactoryInterface $encoderFactory */
 		$encoderFactory = System::getContainer()->get('security.encoder_factory');
-		$encoder = $encoderFactory->getEncoder(BackendUser::class); // This is hardcoded (BE and FE users/members should not have a different algo anyway but if you need it, do not rely on a deprecated class but use the services instead)
+		$encoder = $encoderFactory->getEncoder(User::class);
 
 		return $encoder->encodePassword($strPassword, null);
 	}
@@ -220,7 +220,7 @@ public static function verify($strPassword, $strHash)
 	{
 		/** @var EncoderFactoryInterface $encoderFactory */
 		$encoderFactory = System::getContainer()->get('security.encoder_factory');
-		$encoder = $encoderFactory->getEncoder(BackendUser::class); // This is hardcoded (BE and FE users/members should not have a different algo anyway but if you need it, do not rely on a deprecated class but use the services instead)
+		$encoder = $encoderFactory->getEncoder(User::class);
 
 		return $encoder->isPasswordValid($strHash, $strPassword, null);
 	}

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ protected function validator($varInput)`
`142`	`142`
`143`	`143`	`/** @var EncoderFactoryInterface $encoderFactory */`
`144`	`144`	`$encoderFactory = System::getContainer()->get('security.encoder_factory');`
`145`		`- $encoder = $encoderFactory->getEncoder(BackendUser::class);`
	`145`	`+ $encoder = $encoderFactory->getEncoder(FrontendUser::class);`
`146`	`146`
`147`	`147`	`return $encoder->encodePassword($varInput, null);`
`148`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ public static function hash($strPassword)`
`172`	`172`	`{`
`173`	`173`	`/** @var EncoderFactoryInterface $encoderFactory */`
`174`	`174`	`$encoderFactory = System::getContainer()->get('security.encoder_factory');`
`175`		`- $encoder = $encoderFactory->getEncoder(BackendUser::class); // This is hardcoded (BE and FE users/members should not have a different algo anyway but if you need it, do not rely on a deprecated class but use the services instead)`
	`175`	`+ $encoder = $encoderFactory->getEncoder(User::class);`
`176`	`176`
`177`	`177`	`return $encoder->encodePassword($strPassword, null);`
`178`	`178`	`}`
`@@ -220,7 +220,7 @@ public static function verify($strPassword, $strHash)`
`220`	`220`	`{`
`221`	`221`	`/** @var EncoderFactoryInterface $encoderFactory */`
`222`	`222`	`$encoderFactory = System::getContainer()->get('security.encoder_factory');`
`223`		`- $encoder = $encoderFactory->getEncoder(BackendUser::class); // This is hardcoded (BE and FE users/members should not have a different algo anyway but if you need it, do not rely on a deprecated class but use the services instead)`
	`223`	`+ $encoder = $encoderFactory->getEncoder(User::class);`
`224`	`224`
`225`	`225`	`return $encoder->isPasswordValid($strHash, $strPassword, null);`
`226`	`226`	`}`