Also remove other unnecessary realpath() calls.

This commit is contained in:
Andreas Fischer 2013-08-21 10:53:18 +02:00
parent 9753e44ac2
commit 85ac9572ce
3 changed files with 14 additions and 14 deletions

View File

@ -67,12 +67,12 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$this->pass = \Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1; $this->pass = \Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1;
// set content for encrypting / decrypting in tests // set content for encrypting / decrypting in tests
$this->dataLong = file_get_contents(realpath(dirname(__FILE__) . '/../lib/crypt.php')); $this->dataLong = file_get_contents(dirname(__FILE__) . '/../lib/crypt.php');
$this->dataShort = 'hats'; $this->dataShort = 'hats';
$this->dataUrl = realpath(dirname(__FILE__) . '/../lib/crypt.php'); $this->dataUrl = dirname(__FILE__) . '/../lib/crypt.php';
$this->legacyData = realpath(dirname(__FILE__) . '/legacy-text.txt'); $this->legacyData = dirname(__FILE__) . '/legacy-text.txt';
$this->legacyEncryptedData = realpath(dirname(__FILE__) . '/legacy-encrypted-text.txt'); $this->legacyEncryptedData = dirname(__FILE__) . '/legacy-encrypted-text.txt';
$this->legacyEncryptedDataKey = realpath(dirname(__FILE__) . '/encryption.key'); $this->legacyEncryptedDataKey = dirname(__FILE__) . '/encryption.key';
$this->randomKey = Encryption\Crypt::generateKey(); $this->randomKey = Encryption\Crypt::generateKey();
$keypair = Encryption\Crypt::createKeypair(); $keypair = Encryption\Crypt::createKeypair();

View File

@ -57,11 +57,11 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
function setUp() { function setUp() {
// set content for encrypting / decrypting in tests // set content for encrypting / decrypting in tests
$this->dataLong = file_get_contents(realpath(dirname(__FILE__) . '/../lib/crypt.php')); $this->dataLong = file_get_contents(dirname(__FILE__) . '/../lib/crypt.php');
$this->dataShort = 'hats'; $this->dataShort = 'hats';
$this->dataUrl = realpath(dirname(__FILE__) . '/../lib/crypt.php'); $this->dataUrl = dirname(__FILE__) . '/../lib/crypt.php';
$this->legacyData = realpath(dirname(__FILE__) . '/legacy-text.txt'); $this->legacyData = dirname(__FILE__) . '/legacy-text.txt';
$this->legacyEncryptedData = realpath(dirname(__FILE__) . '/legacy-encrypted-text.txt'); $this->legacyEncryptedData = dirname(__FILE__) . '/legacy-encrypted-text.txt';
$this->randomKey = Encryption\Crypt::generateKey(); $this->randomKey = Encryption\Crypt::generateKey();
$keypair = Encryption\Crypt::createKeypair(); $keypair = Encryption\Crypt::createKeypair();

View File

@ -69,12 +69,12 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
$this->pass = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1; $this->pass = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1;
// set content for encrypting / decrypting in tests // set content for encrypting / decrypting in tests
$this->dataUrl = realpath(dirname(__FILE__) . '/../lib/crypt.php'); $this->dataUrl = dirname(__FILE__) . '/../lib/crypt.php';
$this->dataShort = 'hats'; $this->dataShort = 'hats';
$this->dataLong = file_get_contents(realpath(dirname(__FILE__) . '/../lib/crypt.php')); $this->dataLong = file_get_contents(dirname(__FILE__) . '/../lib/crypt.php');
$this->legacyData = realpath(dirname(__FILE__) . '/legacy-text.txt'); $this->legacyData = dirname(__FILE__) . '/legacy-text.txt';
$this->legacyEncryptedData = realpath(dirname(__FILE__) . '/legacy-encrypted-text.txt'); $this->legacyEncryptedData = dirname(__FILE__) . '/legacy-encrypted-text.txt';
$this->legacyEncryptedDataKey = realpath(dirname(__FILE__) . '/encryption.key'); $this->legacyEncryptedDataKey = dirname(__FILE__) . '/encryption.key';
$this->legacyKey = "30943623843030686906\0\0\0\0"; $this->legacyKey = "30943623843030686906\0\0\0\0";
$keypair = Encryption\Crypt::createKeypair(); $keypair = Encryption\Crypt::createKeypair();