From 85ac9572ce4f43d1a87dfdfd898b17493f9f8539 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Wed, 21 Aug 2013 10:53:18 +0200 Subject: [PATCH] Also remove other unnecessary realpath() calls. --- apps/files_encryption/tests/crypt.php | 10 +++++----- apps/files_encryption/tests/keymanager.php | 8 ++++---- apps/files_encryption/tests/util.php | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php index a4bb3054ef..188606ee1c 100755 --- a/apps/files_encryption/tests/crypt.php +++ b/apps/files_encryption/tests/crypt.php @@ -67,12 +67,12 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { $this->pass = \Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1; // 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->dataUrl = realpath(dirname(__FILE__) . '/../lib/crypt.php'); - $this->legacyData = realpath(dirname(__FILE__) . '/legacy-text.txt'); - $this->legacyEncryptedData = realpath(dirname(__FILE__) . '/legacy-encrypted-text.txt'); - $this->legacyEncryptedDataKey = realpath(dirname(__FILE__) . '/encryption.key'); + $this->dataUrl = dirname(__FILE__) . '/../lib/crypt.php'; + $this->legacyData = dirname(__FILE__) . '/legacy-text.txt'; + $this->legacyEncryptedData = dirname(__FILE__) . '/legacy-encrypted-text.txt'; + $this->legacyEncryptedDataKey = dirname(__FILE__) . '/encryption.key'; $this->randomKey = Encryption\Crypt::generateKey(); $keypair = Encryption\Crypt::createKeypair(); diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php index 6e8b7f2ff0..308cdd4032 100644 --- a/apps/files_encryption/tests/keymanager.php +++ b/apps/files_encryption/tests/keymanager.php @@ -57,11 +57,11 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase { function setUp() { // 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->dataUrl = realpath(dirname(__FILE__) . '/../lib/crypt.php'); - $this->legacyData = realpath(dirname(__FILE__) . '/legacy-text.txt'); - $this->legacyEncryptedData = realpath(dirname(__FILE__) . '/legacy-encrypted-text.txt'); + $this->dataUrl = dirname(__FILE__) . '/../lib/crypt.php'; + $this->legacyData = dirname(__FILE__) . '/legacy-text.txt'; + $this->legacyEncryptedData = dirname(__FILE__) . '/legacy-encrypted-text.txt'; $this->randomKey = Encryption\Crypt::generateKey(); $keypair = Encryption\Crypt::createKeypair(); diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php index 7f80de5933..8a00c51d5b 100755 --- a/apps/files_encryption/tests/util.php +++ b/apps/files_encryption/tests/util.php @@ -69,12 +69,12 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase { $this->pass = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1; // 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->dataLong = file_get_contents(realpath(dirname(__FILE__) . '/../lib/crypt.php')); - $this->legacyData = realpath(dirname(__FILE__) . '/legacy-text.txt'); - $this->legacyEncryptedData = realpath(dirname(__FILE__) . '/legacy-encrypted-text.txt'); - $this->legacyEncryptedDataKey = realpath(dirname(__FILE__) . '/encryption.key'); + $this->dataLong = file_get_contents(dirname(__FILE__) . '/../lib/crypt.php'); + $this->legacyData = dirname(__FILE__) . '/legacy-text.txt'; + $this->legacyEncryptedData = dirname(__FILE__) . '/legacy-encrypted-text.txt'; + $this->legacyEncryptedDataKey = dirname(__FILE__) . '/encryption.key'; $this->legacyKey = "30943623843030686906\0\0\0\0"; $keypair = Encryption\Crypt::createKeypair();