diff options
| -rw-r--r-- | lib/autoloader.php | 4 | ||||
| -rw-r--r-- | lib/base.php | 3 | ||||
| -rw-r--r-- | tests/lib/AutoLoaderTest.php | 6 | ||||
| -rw-r--r-- | tests/lib/Files/Storage/Wrapper/QuotaTest.php | 2 |
4 files changed, 0 insertions, 15 deletions
diff --git a/lib/autoloader.php b/lib/autoloader.php index 7084eb93c89..2a95f5944a3 100644 --- a/lib/autoloader.php +++ b/lib/autoloader.php @@ -95,10 +95,6 @@ class Autoloader { } catch (AppPathNotFoundException) { // App not found, ignore } - } elseif ($class === 'Test\\TestCase') { - // This File is considered public API, so we make sure that the class - // can still be loaded, although the PSR-4 paths have not been loaded. - $paths[] = \OC::$SERVERROOT . '/tests/lib/TestCase.php'; } return $paths; } diff --git a/lib/base.php b/lib/base.php index 639568cf640..75f5cfee3e8 100644 --- a/lib/base.php +++ b/lib/base.php @@ -601,9 +601,6 @@ class OC { self::$loader = new \OC\Autoloader([ OC::$SERVERROOT . '/lib/private/legacy', ]); - if (defined('PHPUNIT_RUN')) { - self::$loader->addValidRoot(OC::$SERVERROOT . '/tests'); - } spl_autoload_register([self::$loader, 'load']); $loaderEnd = microtime(true); diff --git a/tests/lib/AutoLoaderTest.php b/tests/lib/AutoLoaderTest.php index 72d4a2e94cf..9fef8f5280d 100644 --- a/tests/lib/AutoLoaderTest.php +++ b/tests/lib/AutoLoaderTest.php @@ -24,12 +24,6 @@ class AutoLoaderTest extends TestCase { ], $this->loader->findClass('OC_JSON')); } - public function testLoadTestTestCase(): void { - $this->assertEquals([ - \OC::$SERVERROOT . '/tests/lib/TestCase.php' - ], $this->loader->findClass('Test\TestCase')); - } - public function testLoadCore(): void { $this->assertEquals([ \OC::$SERVERROOT . '/lib/private/legacy/foo/bar.php', diff --git a/tests/lib/Files/Storage/Wrapper/QuotaTest.php b/tests/lib/Files/Storage/Wrapper/QuotaTest.php index 791e8047f7f..3115f1288a0 100644 --- a/tests/lib/Files/Storage/Wrapper/QuotaTest.php +++ b/tests/lib/Files/Storage/Wrapper/QuotaTest.php @@ -12,8 +12,6 @@ use OC\Files\Cache\CacheEntry; use OC\Files\Storage\Local; use OCP\Files; -\OC::$loader->load('\OC\Files\Filesystem'); - /** * Class QuotaTest * |