Merge branch '3.4' into 4.0

chalasr · chalasr · commit 0895c03e4b3c · 2017-12-11T15:31:42.000+01:00
* 3.4:
  minor #25421 grammar typo in docs (michaelKaefer)
  Extend Argon2i support check to account for sodium_compat
diff --git a/StoreInterface.php b/StoreInterface.php
@@ -31,7 +31,7 @@ interface StoreInterface
     public function save(Key $key);
 
     /**
-     * Waits a key becomes free, then stores the resource.
+     * Waits until a key becomes free, then stores the resource.
      *
      * If the store does not support this feature it should throw a NotSupportedException.
      *

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ interface StoreInterface`
`31`	`31`	`public function save(Key $key);`
`32`	`32`
`33`	`33`	`/**`
`34`		`- * Waits a key becomes free, then stores the resource.`
	`34`	`+ * Waits until a key becomes free, then stores the resource.`
`35`	`35`	`*`
`36`	`36`	`* If the store does not support this feature it should throw a NotSupportedException.`
`37`	`37`	`*`