composer format ...

pull/142/head
David Goodwin 7 years ago
parent 6446f3f6cc
commit b79ad2ae28

@ -902,7 +902,6 @@ function _pacrypt_md5crypt($pw, $pw_db) {
} }
function _pacrypt_crypt($pw, $pw_db) { function _pacrypt_crypt($pw, $pw_db) {
if ($pw_db) { if ($pw_db) {
return crypt($pw, $pw_db); return crypt($pw, $pw_db);
} }
@ -1076,7 +1075,6 @@ function pacrypt($pw, $pw_db="") {
} }
die('unknown/invalid $CONF["encrypt"] setting: ' . $CONF['encrypt']); die('unknown/invalid $CONF["encrypt"] setting: ' . $CONF['encrypt']);
} }
// //

@ -3,7 +3,6 @@
require_once('common.php'); require_once('common.php');
class PaCryptTest extends PHPUnit_Framework_TestCase { class PaCryptTest extends PHPUnit_Framework_TestCase {
public function testMd5Crypt() { public function testMd5Crypt() {
$hash = _pacrypt_md5crypt('test', ''); $hash = _pacrypt_md5crypt('test', '');
@ -23,7 +22,6 @@ class PaCryptTest extends PHPUnit_Framework_TestCase {
$this->assertNotEquals('test', $hash); $this->assertNotEquals('test', $hash);
$this->assertEquals($hash, _pacrypt_crypt('test', $hash)); $this->assertEquals($hash, _pacrypt_crypt('test', $hash));
} }
public function testMySQLEncrypt() { public function testMySQLEncrypt() {
@ -54,7 +52,6 @@ class PaCryptTest extends PHPUnit_Framework_TestCase {
'md5' => 'CY9rzUYh03PK3k6DJie09g==', 'md5' => 'CY9rzUYh03PK3k6DJie09g==',
// crypt requires salt ... // crypt requires salt ...
'SHA' => 'qUqP5cyxm6YcTAhz05Hph5gvu9M='] as $flavour => $hash) { 'SHA' => 'qUqP5cyxm6YcTAhz05Hph5gvu9M='] as $flavour => $hash) {
$CONF['authlib_default_flavour'] = $flavour; $CONF['authlib_default_flavour'] = $flavour;
$stored = "{" . $flavour . "}$hash"; $stored = "{" . $flavour . "}$hash";
@ -79,10 +76,7 @@ class PaCryptTest extends PHPUnit_Framework_TestCase {
$this->assertEquals($expected_hash, _pacrypt_dovecot('test', '')); $this->assertEquals($expected_hash, _pacrypt_dovecot('test', ''));
$this->assertEquals($expected_hash, _pacrypt_dovecot('test', $expected_hash)); $this->assertEquals($expected_hash, _pacrypt_dovecot('test', $expected_hash));
} }
} }
/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */ /* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */

@ -8,8 +8,6 @@
require_once('RemoteTest.php'); require_once('RemoteTest.php');
class RemoteUserTest extends RemoteTest { class RemoteUserTest extends RemoteTest {
public function testChangePassword() { public function testChangePassword() {
try { try {
$this->assertTrue($this->user->login($this->username, $this->password)); $this->assertTrue($this->user->login($this->username, $this->password));

Loading…
Cancel
Save