diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2017-07-19 18:46:01 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2017-08-01 08:20:16 +0200 |
| commit | 4166d61ce6343cab8e40dd223a02184f13a1e7a3 (patch) | |
| tree | e2de5428b27e856ded42190afea10b78a419e671 /lib | |
| parent | b53c4c0db9379e48ab0792cd31d09d8134a8c490 (diff) | |
| download | nextcloud-server-4166d61ce6343cab8e40dd223a02184f13a1e7a3.tar.gz nextcloud-server-4166d61ce6343cab8e40dd223a02184f13a1e7a3.zip | |
Fix MigrationSchemaChecker and CryptoWrapper
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/App/CodeChecker/MigrationSchemaChecker.php | 6 | ||||
| -rw-r--r-- | lib/private/Session/CryptoWrapper.php | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/lib/private/App/CodeChecker/MigrationSchemaChecker.php b/lib/private/App/CodeChecker/MigrationSchemaChecker.php index 9dee358327d..ea403ad7758 100644 --- a/lib/private/App/CodeChecker/MigrationSchemaChecker.php +++ b/lib/private/App/CodeChecker/MigrationSchemaChecker.php @@ -36,6 +36,12 @@ class MigrationSchemaChecker extends NodeVisitorAbstract { /** @var array */ public $errors = []; + /** + * @param Node $node + * @return void + * + * @suppress PhanUndeclaredProperty + */ public function enterNode(Node $node) { /** * Check tables diff --git a/lib/private/Session/CryptoWrapper.php b/lib/private/Session/CryptoWrapper.php index 67a673cb309..1cec2670650 100644 --- a/lib/private/Session/CryptoWrapper.php +++ b/lib/private/Session/CryptoWrapper.php @@ -50,14 +50,16 @@ use OCP\Security\ISecureRandom; class CryptoWrapper { const COOKIE_NAME = 'oc_sessionPassphrase'; + /** @var IConfig */ + protected $config; /** @var ISession */ protected $session; - - /** @var \OCP\Security\ICrypto */ + /** @var ICrypto */ protected $crypto; - /** @var ISecureRandom */ protected $random; + /** @var string */ + protected $passphrase; /** * @param IConfig $config |