mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #20031 from owncloud/remove-dead-code 

Remove dead code from autoloader
This commit is contained in:
Thomas Müller 2015-10-26 11:07:56 +01:00
parent d4d954b2d9 ff1271c7f3
commit 7e3b4754f6
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/autoloader.php
View File

@ -31,12 +31,9 @@ namespace OC;
use \OCP\AutoloadNotAllowedException;
class Autoloader {
/** @var bool */
private $useGlobalClassPath = true;
private $prefixPaths = array();
private $classPaths = array();
/** @var array */
private $validRoots = [];
/**
@ -91,9 +88,7 @@ class Autoloader {
$class = trim($class, '\\');
$paths = array();
if (array_key_exists($class, $this->classPaths)) {
$paths[] = $this->classPaths[$class];
} else if ($this->useGlobalClassPath and array_key_exists($class, \OC::$CLASSPATH)) {
if ($this->useGlobalClassPath && array_key_exists($class, \OC::$CLASSPATH)) {
$paths[] = \OC::$CLASSPATH[$class];
/**
* @TODO: Remove this when necessary
@ -129,6 +124,10 @@ class Autoloader {
return $paths;
}
/**
* @param string $fullPath
* @return bool
*/
protected function isValidPath($fullPath) {
foreach ($this->validRoots as $root => $true) {
if (substr($fullPath, 0, strlen($root) + 1) === $root . '/') {