From f89b96ef6e48e54b2b8cb262dabf2baa07afbc40 Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Wed, 17 Apr 2019 23:45:20 +0200
Subject: [PATCH] [BUGFIX] Fix alias of SaltedPasswordsService
A simple typo.
In TYPO3 v9.5 there need to be more adjustments done.
Resolves: #88007
Releases: master, 9.5
Change-Id: I6cd49b18b048b0e3b4362fc53c89a4617914f913
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/60505
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Mathias Brodala <mbrodala@pagemachine.de>
Tested-by: Josef Glatz <josefglatz@gmail.com>
Tested-by: Susanne Moog <look@susi.dev>
Reviewed-by: Mathias Brodala <mbrodala@pagemachine.de>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Josef Glatz <josefglatz@gmail.com>
Reviewed-by: Susanne Moog <look@susi.dev>
---
...on-85833-ExtensionSaltedpasswordsMergedIntoCoreExtension.rst | 2 +-
.../master/Breaking-87193-DeprecatedFunctionalityRemoved.rst | 2 +-
.../Configuration/ExtensionScanner/Php/ClassNameMatcher.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/typo3/sysext/core/Documentation/Changelog/9.4/Deprecation-85833-ExtensionSaltedpasswordsMergedIntoCoreExtension.rst b/typo3/sysext/core/Documentation/Changelog/9.4/Deprecation-85833-ExtensionSaltedpasswordsMergedIntoCoreExtension.rst
index ba81d6a65b1a..9ec6995924a3 100644
--- a/typo3/sysext/core/Documentation/Changelog/9.4/Deprecation-85833-ExtensionSaltedpasswordsMergedIntoCoreExtension.rst
+++ b/typo3/sysext/core/Documentation/Changelog/9.4/Deprecation-85833-ExtensionSaltedpasswordsMergedIntoCoreExtension.rst
@@ -31,7 +31,7 @@ The following classes have been renamed:
* (deprecated) :php:`TYPO3\CMS\Saltedpasswords\Salt\AbstractComposedSalt::class` to :php:`TYPO3\CMS\Core\Crypto\PasswordHashing\AbstractComposedSalt::class`
* (deprecated) :php:`TYPO3\CMS\Saltedpasswords\Salt\ComposedSaltInterface::class` to :php:`TYPO3\CMS\Core\Crypto\PasswordHashing\ComposedPasswordHashInterface::class`
* (deprecated) :php:`TYPO3\CMS\Saltedpasswords\Utility\ExensionManagerConfigurationUtility::class` to :php:`TYPO3\CMS\Core\Crypto\PasswordHashing\ExtensionManagerConfigurationUtility::class`
-* (deprecated) :php:`TYPO3\CMS\Saltedpasswords\SaltedPasswordsService::class` to :php:`TYPO3\CMS\Core\Crypto\PasswordHashing\SaltedPasswordService::class`
+* (deprecated) :php:`TYPO3\CMS\Saltedpasswords\SaltedPasswordService::class` to :php:`TYPO3\CMS\Core\Crypto\PasswordHashing\SaltedPasswordService::class`
* (deprecated) :php:`TYPO3\CMS\Saltedpasswords\Utility\SaltedPasswordsUtility::class` to :php:`TYPO3\CMS\Core\Crypto\PasswordHashing\SaltedPasswordsUtility::class`
The following language files have been moved:
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-87193-DeprecatedFunctionalityRemoved.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-87193-DeprecatedFunctionalityRemoved.rst
index 116c3d8b675e..40c416c485ac 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Breaking-87193-DeprecatedFunctionalityRemoved.rst
+++ b/typo3/sysext/core/Documentation/Changelog/master/Breaking-87193-DeprecatedFunctionalityRemoved.rst
@@ -173,7 +173,7 @@ The following PHP class aliases that have been previously deprecated for v9 have
* :php:`TYPO3\CMS\Saltedpasswords\Salt\SaltInterface`
* :php:`TYPO3\CMS\Saltedpasswords\Salt\Pbkdf2Salt`
* :php:`TYPO3\CMS\Saltedpasswords\Salt\PhpassSalt`
-* :php:`TYPO3\CMS\Saltedpasswords\SaltedPasswordsService`
+* :php:`TYPO3\CMS\Saltedpasswords\SaltedPasswordService`
* :php:`TYPO3\CMS\Saltedpasswords\Utility\ExensionManagerConfigurationUtility`
* :php:`TYPO3\CMS\Saltedpasswords\Utility\SaltedPasswordsUtility`
* :php:`TYPO3\CMS\Sv\AbstractAuthenticationService`
diff --git a/typo3/sysext/install/Configuration/ExtensionScanner/Php/ClassNameMatcher.php b/typo3/sysext/install/Configuration/ExtensionScanner/Php/ClassNameMatcher.php
index 587a8533ddcb..532e235abb10 100644
--- a/typo3/sysext/install/Configuration/ExtensionScanner/Php/ClassNameMatcher.php
+++ b/typo3/sysext/install/Configuration/ExtensionScanner/Php/ClassNameMatcher.php
@@ -885,7 +885,7 @@ return [
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
- 'TYPO3\CMS\Saltedpasswords\SaltedPasswordsService' => [
+ 'TYPO3\CMS\Saltedpasswords\SaltedPasswordService' => [
'restFiles' => [
'Deprecation-85833-ExtensionSaltedpasswordsMergedIntoCoreExtension.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
--
GitLab