From 0621db8a2348af193606a1d33046c57f763cdb0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Pe=CC=81rez=20Crespo?= <jaime.perez@uninett.no>
Date: Mon, 8 Jan 2018 13:34:27 +0100
Subject: [PATCH] Revert "Fix psalm issues."
This reverts commit 9ad60fe1cdad3f8c293a0530c9784bef03389b07.
---
lib/SimpleSAML/Utils/Crypto.php | 1 -
lib/SimpleSAML/Utils/HTTP.php | 1 -
2 files changed, 2 deletions(-)
diff --git a/lib/SimpleSAML/Utils/Crypto.php b/lib/SimpleSAML/Utils/Crypto.php
index f0b723d4f..749d9d2db 100644
--- a/lib/SimpleSAML/Utils/Crypto.php
+++ b/lib/SimpleSAML/Utils/Crypto.php
@@ -49,7 +49,6 @@ class Crypto
// authenticate the ciphertext
if (self::secureCompare(hash_hmac('sha256', $iv.$msg, substr($key, 64, 64), true), $hmac)) {
- /** @var string|false $plaintext */
$plaintext = openssl_decrypt(
$msg,
'AES-256-CBC',
diff --git a/lib/SimpleSAML/Utils/HTTP.php b/lib/SimpleSAML/Utils/HTTP.php
index 5367f654d..96cfc62ec 100644
--- a/lib/SimpleSAML/Utils/HTTP.php
+++ b/lib/SimpleSAML/Utils/HTTP.php
@@ -756,7 +756,6 @@ class HTTP
{
$cfg = \SimpleSAML_Configuration::getInstance();
$baseDir = $cfg->getBaseDir();
- /** @var string|false $cur_path */
$cur_path = realpath($_SERVER['SCRIPT_FILENAME']);
// make sure we got a string from realpath()
$cur_path = is_string($cur_path) ? $cur_path : '';
--
GitLab