From ff1271c7f348b615998489c770741cec277b6684 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Sun, 25 Oct 2015 23:45:07 +0100
Subject: [PATCH] Remove dead code
Those variables are never written to. Thus this is dead code which should be removed.
---
lib/autoloader.php | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/lib/autoloader.php b/lib/autoloader.php
index f60f5a358c..b94ac6c5ee 100644
--- a/lib/autoloader.php
+++ b/lib/autoloader.php
@@ -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 . '/') {
--
GitLab