Merge pull request #29 from GuangHa/flow-6.0

Add Flow 6.x compatibility
neos · Feb 10, 2021 · 2d485f4 · 2d485f4
2 parents e9194f1 + aeaf4b7
commit 2d485f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Classes/Security/Authentication/Provider/LdapProvider.php b/Classes/Security/Authentication/Provider/LdapProvider.php
@@ -12,7 +12,7 @@
  */
 
 use Neos\Flow\Annotations as Flow;
-use Neos\Flow\Log\SecurityLoggerInterface;
+use Neos\Flow\Log\PsrSecurityLoggerInterface;
 use Neos\Flow\Security\Account;
 use Neos\Flow\Security\Authentication\Provider\PersistedUsernamePasswordProvider;
 use Neos\Flow\Security\Authentication\Token\UsernamePassword;
@@ -48,7 +48,7 @@ class LdapProvider extends PersistedUsernamePasswordProvider
 
     /**
      * @Flow\Inject
-     * @var SecurityLoggerInterface
+     * @var PsrSecurityLoggerInterface
      */
     protected $logger;
 
@@ -102,7 +102,7 @@ public function authenticate(TokenInterface $authenticationToken)
             $authenticationToken->setAccount($account);
             $this->emitAccountAuthenticated($account, $ldapUser);
         } catch (\Exception $exception) {
-            $this->logger->log('Authentication failed: ' . $exception->getMessage(), LOG_ALERT);
+            $this->logger->alert('Authentication failed: ' . $exception->getMessage());
             $authenticationToken->setAuthenticationStatus(TokenInterface::WRONG_CREDENTIALS);
         }
     }

diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
         "MIT"
     ],
     "require": {
-        "neos/flow": "^4.0 || ^5.0",
+        "neos/flow": "^6.0",
         "ext-ldap": "*"
     },
     "replace": {