Use __DIR__ instead of dirname(__FILE__).

This is possible because we require PHP 5.3 or higher.

diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 47801252bbd3f79525cb657729e7d5b34ceac312..e129bc9313ef3836b0ff3709e26d8428efaf35ca 100755 (executable)
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -25,7 +25,7 @@
 \r
 namespace OCA\Encryption;\r
 \r
-require_once dirname(__FILE__) . '/../3rdparty/Crypt_Blowfish/Blowfish.php';\r
+require_once __DIR__ . '/../3rdparty/Crypt_Blowfish/Blowfish.php';\r
 \r
 /**\r
  * Class for common cryptography functionality\r

diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 188606ee1c5c10f677805b4e6b6e9a12b7f64539..f73647d8af5f4c92adf8efd18ddce736776162c9 100755 (executable)
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -7,16 +7,16 @@
  * See the COPYING-README file.
  */
 
-require_once dirname(__FILE__) . '/../3rdparty/Crypt_Blowfish/Blowfish.php';
-require_once dirname(__FILE__) . '/../../../lib/base.php';
-require_once dirname(__FILE__) . '/../lib/crypt.php';
-require_once dirname(__FILE__) . '/../lib/keymanager.php';
-require_once dirname(__FILE__) . '/../lib/proxy.php';
-require_once dirname(__FILE__) . '/../lib/stream.php';
-require_once dirname(__FILE__) . '/../lib/util.php';
-require_once dirname(__FILE__) . '/../lib/helper.php';
-require_once dirname(__FILE__) . '/../appinfo/app.php';
-require_once dirname(__FILE__) . '/util.php';
+require_once __DIR__ . '/../3rdparty/Crypt_Blowfish/Blowfish.php';
+require_once __DIR__ . '/../../../lib/base.php';
+require_once __DIR__ . '/../lib/crypt.php';
+require_once __DIR__ . '/../lib/keymanager.php';
+require_once __DIR__ . '/../lib/proxy.php';
+require_once __DIR__ . '/../lib/stream.php';
+require_once __DIR__ . '/../lib/util.php';
+require_once __DIR__ . '/../lib/helper.php';
+require_once __DIR__ . '/../appinfo/app.php';
+require_once __DIR__ . '/util.php';
 
 use OCA\Encryption;
 
@@ -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(dirname(__FILE__) . '/../lib/crypt.php');
+               $this->dataLong = file_get_contents(__DIR__ . '/../lib/crypt.php');
                $this->dataShort = 'hats';
-               $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->dataUrl = __DIR__ . '/../lib/crypt.php';
+               $this->legacyData = __DIR__ . '/legacy-text.txt';
+               $this->legacyEncryptedData = __DIR__ . '/legacy-encrypted-text.txt';
+               $this->legacyEncryptedDataKey = __DIR__ . '/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 308cdd403274aea6089327e11bb9fc9db38da7ba..0fe9ce9ed593069bb382a69191fcd8a35edabeef 100644 (file)
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -6,15 +6,15 @@
  * See the COPYING-README file.
  */
 
-require_once dirname(__FILE__) . '/../../../lib/base.php';
-require_once dirname(__FILE__) . '/../lib/crypt.php';
-require_once dirname(__FILE__) . '/../lib/keymanager.php';
-require_once dirname(__FILE__) . '/../lib/proxy.php';
-require_once dirname(__FILE__) . '/../lib/stream.php';
-require_once dirname(__FILE__) . '/../lib/util.php';
-require_once dirname(__FILE__) . '/../lib/helper.php';
-require_once dirname(__FILE__) . '/../appinfo/app.php';
-require_once dirname(__FILE__) . '/util.php';
+require_once __DIR__ . '/../../../lib/base.php';
+require_once __DIR__ . '/../lib/crypt.php';
+require_once __DIR__ . '/../lib/keymanager.php';
+require_once __DIR__ . '/../lib/proxy.php';
+require_once __DIR__ . '/../lib/stream.php';
+require_once __DIR__ . '/../lib/util.php';
+require_once __DIR__ . '/../lib/helper.php';
+require_once __DIR__ . '/../appinfo/app.php';
+require_once __DIR__ . '/util.php';
 
 use OCA\Encryption;
 
@@ -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(dirname(__FILE__) . '/../lib/crypt.php');
+               $this->dataLong = file_get_contents(__DIR__ . '/../lib/crypt.php');
                $this->dataShort = 'hats';
-               $this->dataUrl = dirname(__FILE__) . '/../lib/crypt.php';
-               $this->legacyData = dirname(__FILE__) . '/legacy-text.txt';
-               $this->legacyEncryptedData = dirname(__FILE__) . '/legacy-encrypted-text.txt';
+               $this->dataUrl = __DIR__ . '/../lib/crypt.php';
+               $this->legacyData = __DIR__ . '/legacy-text.txt';
+               $this->legacyEncryptedData = __DIR__ . '/legacy-encrypted-text.txt';
                $this->randomKey = Encryption\Crypt::generateKey();
 
                $keypair = Encryption\Crypt::createKeypair();

diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 7f68ecd388a521f85fe177dca8e15728a4fc88ba..bc3f93ff701ea446f365975af82c13d9f0257125 100755 (executable)
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -20,16 +20,16 @@
  *
  */
 
-require_once dirname(__FILE__) . '/../3rdparty/Crypt_Blowfish/Blowfish.php';
-require_once dirname(__FILE__) . '/../../../lib/base.php';
-require_once dirname(__FILE__) . '/../lib/crypt.php';
-require_once dirname(__FILE__) . '/../lib/keymanager.php';
-require_once dirname(__FILE__) . '/../lib/proxy.php';
-require_once dirname(__FILE__) . '/../lib/stream.php';
-require_once dirname(__FILE__) . '/../lib/util.php';
-require_once dirname(__FILE__) . '/../lib/helper.php';
-require_once dirname(__FILE__) . '/../appinfo/app.php';
-require_once dirname(__FILE__) . '/util.php';
+require_once __DIR__ . '/../3rdparty/Crypt_Blowfish/Blowfish.php';
+require_once __DIR__ . '/../../../lib/base.php';
+require_once __DIR__ . '/../lib/crypt.php';
+require_once __DIR__ . '/../lib/keymanager.php';
+require_once __DIR__ . '/../lib/proxy.php';
+require_once __DIR__ . '/../lib/stream.php';
+require_once __DIR__ . '/../lib/util.php';
+require_once __DIR__ . '/../lib/helper.php';
+require_once __DIR__ . '/../appinfo/app.php';
+require_once __DIR__ . '/util.php';
 
 use OCA\Encryption;
 

diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index adc0d1959a00d7c78f5131124bb9eb6b5598c770..3095d50613c75574d095d675fda2dbe6caa8458c 100644 (file)
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -20,14 +20,14 @@
  *
  */
 
-require_once dirname(__FILE__) . '/../../../lib/base.php';
-require_once dirname(__FILE__) . '/../lib/crypt.php';
-require_once dirname(__FILE__) . '/../lib/keymanager.php';
-require_once dirname(__FILE__) . '/../lib/proxy.php';
-require_once dirname(__FILE__) . '/../lib/stream.php';
-require_once dirname(__FILE__) . '/../lib/util.php';
-require_once dirname(__FILE__) . '/../appinfo/app.php';
-require_once dirname(__FILE__) . '/util.php';
+require_once __DIR__ . '/../../../lib/base.php';
+require_once __DIR__ . '/../lib/crypt.php';
+require_once __DIR__ . '/../lib/keymanager.php';
+require_once __DIR__ . '/../lib/proxy.php';
+require_once __DIR__ . '/../lib/stream.php';
+require_once __DIR__ . '/../lib/util.php';
+require_once __DIR__ . '/../appinfo/app.php';
+require_once __DIR__ . '/util.php';
 
 use OCA\Encryption;
 

diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php
index 55ec94782eb302067ae50ab10c0bbe320ecc6933..e33add748296e3e9060704d2481ffde00341fa7e 100755 (executable)
--- a/apps/files_encryption/tests/trashbin.php
+++ b/apps/files_encryption/tests/trashbin.php
@@ -20,15 +20,15 @@
  *
  */
 
-require_once dirname(__FILE__) . '/../../../lib/base.php';
-require_once dirname(__FILE__) . '/../lib/crypt.php';
-require_once dirname(__FILE__) . '/../lib/keymanager.php';
-require_once dirname(__FILE__) . '/../lib/proxy.php';
-require_once dirname(__FILE__) . '/../lib/stream.php';
-require_once dirname(__FILE__) . '/../lib/util.php';
-require_once dirname(__FILE__) . '/../appinfo/app.php';
-require_once dirname(__FILE__) . '/../../files_trashbin/appinfo/app.php';
-require_once dirname(__FILE__) . '/util.php';
+require_once __DIR__ . '/../../../lib/base.php';
+require_once __DIR__ . '/../lib/crypt.php';
+require_once __DIR__ . '/../lib/keymanager.php';
+require_once __DIR__ . '/../lib/proxy.php';
+require_once __DIR__ . '/../lib/stream.php';
+require_once __DIR__ . '/../lib/util.php';
+require_once __DIR__ . '/../appinfo/app.php';
+require_once __DIR__ . '/../../files_trashbin/appinfo/app.php';
+require_once __DIR__ . '/util.php';
 
 use OCA\Encryption;
 

diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index 8a00c51d5b62a5faec87b8b66b2d351f92b92743..eddc4c6b3ffc795c25b9a15b960fe186bbd69b6b 100755 (executable)
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -6,13 +6,13 @@
  * See the COPYING-README file.
  */
 
-require_once dirname(__FILE__) . '/../../../lib/base.php';
-require_once dirname(__FILE__) . '/../lib/crypt.php';
-require_once dirname(__FILE__) . '/../lib/keymanager.php';
-require_once dirname(__FILE__) . '/../lib/proxy.php';
-require_once dirname(__FILE__) . '/../lib/stream.php';
-require_once dirname(__FILE__) . '/../lib/util.php';
-require_once dirname(__FILE__) . '/../appinfo/app.php';
+require_once __DIR__ . '/../../../lib/base.php';
+require_once __DIR__ . '/../lib/crypt.php';
+require_once __DIR__ . '/../lib/keymanager.php';
+require_once __DIR__ . '/../lib/proxy.php';
+require_once __DIR__ . '/../lib/stream.php';
+require_once __DIR__ . '/../lib/util.php';
+require_once __DIR__ . '/../appinfo/app.php';
 
 use OCA\Encryption;
 
@@ -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 = dirname(__FILE__) . '/../lib/crypt.php';
+               $this->dataUrl = __DIR__ . '/../lib/crypt.php';
                $this->dataShort = 'hats';
-               $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->dataLong = file_get_contents(__DIR__ . '/../lib/crypt.php');
+               $this->legacyData = __DIR__ . '/legacy-text.txt';
+               $this->legacyEncryptedData = __DIR__ . '/legacy-encrypted-text.txt';
+               $this->legacyEncryptedDataKey = __DIR__ . '/encryption.key';
                $this->legacyKey = "30943623843030686906\0\0\0\0";
 
                $keypair = Encryption\Crypt::createKeypair();

diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php
index b72f68169519deef3ad638e6441e748bc0924b8b..5c2f87b145de49f6a33ff39de1bbb94f7c756116 100755 (executable)
--- a/apps/files_encryption/tests/webdav.php
+++ b/apps/files_encryption/tests/webdav.php
@@ -20,14 +20,14 @@
  *
  */
 
-require_once dirname(__FILE__) . '/../../../lib/base.php';
-require_once dirname(__FILE__) . '/../lib/crypt.php';
-require_once dirname(__FILE__) . '/../lib/keymanager.php';
-require_once dirname(__FILE__) . '/../lib/proxy.php';
-require_once dirname(__FILE__) . '/../lib/stream.php';
-require_once dirname(__FILE__) . '/../lib/util.php';
-require_once dirname(__FILE__) . '/../appinfo/app.php';
-require_once dirname(__FILE__) . '/util.php';
+require_once __DIR__ . '/../../../lib/base.php';
+require_once __DIR__ . '/../lib/crypt.php';
+require_once __DIR__ . '/../lib/keymanager.php';
+require_once __DIR__ . '/../lib/proxy.php';
+require_once __DIR__ . '/../lib/stream.php';
+require_once __DIR__ . '/../lib/util.php';
+require_once __DIR__ . '/../appinfo/app.php';
+require_once __DIR__ . '/util.php';
 
 use OCA\Encryption;