Merge branch '4.4'

chalasr · chalasr · commit aaa2735f5765 · 2019-10-29T03:20:27.000+01:00
* 4.4:
  [Security] Fix merge
  remove outdated workflow test
  drop wrong test (fix merge)
diff --git a/Encoder/NativePasswordEncoder.php b/Encoder/NativePasswordEncoder.php
@@ -48,7 +48,7 @@ public function __construct(int $opsLimit = null, int $memLimit = null, int $cos
             throw new \InvalidArgumentException('$cost must be in the range of 4-31.');
         }
 
-        $this->algo = (string) ($algo ?? \defined('PASSWORD_ARGON2ID') ? PASSWORD_ARGON2ID : (\defined('PASSWORD_ARGON2I') ? PASSWORD_ARGON2I : PASSWORD_BCRYPT));
+        $this->algo = (string) ($algo ?? (\defined('PASSWORD_ARGON2ID') ? PASSWORD_ARGON2ID : (\defined('PASSWORD_ARGON2I') ? PASSWORD_ARGON2I : PASSWORD_BCRYPT)));
         $this->options = [
             'cost' => $cost,
             'time_cost' => $opsLimit,

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function __construct(int $opsLimit = null, int $memLimit = null, int $cos`
`48`	`48`	`throw new \InvalidArgumentException('$cost must be in the range of 4-31.');`
`49`	`49`	`}`
`50`	`50`
`51`		`- $this->algo = (string) ($algo ?? \defined('PASSWORD_ARGON2ID') ? PASSWORD_ARGON2ID : (\defined('PASSWORD_ARGON2I') ? PASSWORD_ARGON2I : PASSWORD_BCRYPT));`
	`51`	`+ $this->algo = (string) ($algo ?? (\defined('PASSWORD_ARGON2ID') ? PASSWORD_ARGON2ID : (\defined('PASSWORD_ARGON2I') ? PASSWORD_ARGON2I : PASSWORD_BCRYPT)));`
`52`	`52`	`$this->options = [`
`53`	`53`	`'cost' => $cost,`
`54`	`54`	`'time_cost' => $opsLimit,`