Merge "Reset scoped session for upload jobs after deferred updates"

[lhc/web/wiklou.git] / includes / password / Pbkdf2Password.php

diff --git a/includes/password/Pbkdf2Password.php b/includes/password/Pbkdf2Password.php
index 417753f..8ef6f8d 100644 (file)
--- a/includes/password/Pbkdf2Password.php
+++ b/includes/password/Pbkdf2Password.php
@@ -30,11 +30,11 @@
  */
 class Pbkdf2Password extends ParameterizedPassword {
        protected function getDefaultParams() {
-               return array(
+               return [
                        'algo' => $this->config['algo'],
                        'rounds' => $this->config['cost'],
                        'length' => $this->config['length']
-               );
+               ];
        }
 
        protected function getDelimiter() {
@@ -51,8 +51,8 @@ class Pbkdf2Password extends ParameterizedPassword {
                                $this->params['algo'],
                                $password,
                                base64_decode( $this->args[0] ),
-                               $this->params['rounds'],
-                               $this->params['length'],
+                               (int)$this->params['rounds'],
+                               (int)$this->params['length'],
                                true
                        );
                } else {