Browse Source

Fix new phpstan errors

pull/9829/head
Aleksander Machniak 4 months ago
parent
commit
f37a959197
  1. 4
      plugins/enigma/tests/EnigmaEngineTest.php
  2. 4
      plugins/http_authentication/http_authentication.php
  3. 7
      plugins/krb_authentication/krb_authentication.php
  4. 3
      program/lib/Roundcube/rcube_csv2vcard.php
  5. 6
      program/lib/Roundcube/rcube_ldap.php

4
plugins/enigma/tests/EnigmaEngineTest.php

@ -18,7 +18,7 @@ class EnigmaEngineTest extends TestCase
$engine->password_handler();
$this->assertTrue(!array_key_exists('enigma_pass', $_SESSION));
$this->assertFalse(array_key_exists('enigma_pass', $_SESSION)); // @phpstan-ignore-line
$this->assertSame([], $engine->get_passwords());
$_POST = ['_keyid' => 'abc', '_passwd' => '123<a>456'];
@ -26,7 +26,7 @@ class EnigmaEngineTest extends TestCase
$time = time();
$engine->password_handler();
$store = unserialize($rcube->decrypt($_SESSION['enigma_pass']));
$store = unserialize($rcube->decrypt($_SESSION['enigma_pass'])); // @phpstan-ignore-line
$this->assertCount(2, $store['ABC']);
$this->assertSame('123<a>456', $store['ABC'][0]);

4
plugins/http_authentication/http_authentication.php

@ -41,9 +41,7 @@ class http_authentication extends rcube_plugin
$this->redirect_query = $_SERVER['QUERY_STRING'];
}
// Set user password in session (see shutdown() method for more info)
elseif (!empty($_SESSION['user_id']) && empty($_SESSION['password'])
&& !empty($_SERVER['PHP_AUTH_PW'])
) {
elseif (empty($_SESSION['password']) && !empty($_SERVER['PHP_AUTH_PW'])) {
$_SESSION['password'] = $rcmail->encrypt($_SERVER['PHP_AUTH_PW']);
}
}

7
plugins/krb_authentication/krb_authentication.php

@ -63,11 +63,8 @@ class krb_authentication extends rcube_plugin
$args['host'] = rcube_utils::idn_to_ascii(rcube_utils::parse_host($host));
}
if (!empty($_SERVER['REMOTE_USER'])) {
$args['user'] = $_SERVER['REMOTE_USER'];
$args['pass'] = null;
}
$args['user'] = $_SERVER['REMOTE_USER'];
$args['pass'] = null;
$args['cookiecheck'] = false;
$args['valid'] = true;
}

3
program/lib/Roundcube/rcube_csv2vcard.php

@ -660,7 +660,8 @@ class rcube_csv2vcard
}
}
if (!empty($contact['gender']) && ($gender = strtolower($contact['gender']))) {
if (!empty($contact['gender'])) {
$gender = strtolower($contact['gender']);
if (!in_array($gender, ['male', 'female'])) {
unset($contact['gender']);
}

6
program/lib/Roundcube/rcube_ldap.php

@ -688,9 +688,9 @@ class rcube_ldap extends rcube_addressbook
$attrs = [];
foreach ((array) $entry['objectclass'] as $objectclass) {
if (($member_attr = $this->get_group_member_attr([$objectclass], ''))
&& ($member_attr = strtolower($member_attr)) && !in_array($member_attr, $attrs)
) {
$member_attr = $this->get_group_member_attr([$objectclass], '');
$member_attr = $member_attr ? strtolower($member_attr) : null;
if ($member_attr && !in_array($member_attr, $attrs)) {
$members = $this->_list_group_members($dn, $entry, $member_attr, $count);
$group_members = array_merge($group_members, $members);
$attrs[] = $member_attr;

Loading…
Cancel
Save