joomla · laoneo · Sep 10, 2018 · May 12, 2018 · May 12, 2018 · May 12, 2018
diff --git a/.gitignore b/.gitignore
@@ -142,6 +142,7 @@ Desktop.ini
 /libraries/vendor/leafo/lessphp/Makefile
 /libraries/vendor/leafo/lessphp/package.sh
 /libraries/vendor/leafo/lessphp/README.md
+/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/*
 /libraries/vendor/mso/idna-convert/.gitattributes
 /libraries/vendor/mso/idna-convert/.gitignore
 /libraries/vendor/mso/idna-convert/composer.json

diff --git a/administrator/language/en-GB/en-GB.plg_system_debug.ini b/administrator/language/en-GB/en-GB.plg_system_debug.ini
@@ -21,6 +21,8 @@ PLG_DEBUG_FIELD_LOG_CATEGORIES_LABEL="Log Categories"
 PLG_DEBUG_FIELD_LOG_CATEGORY_MODE_EXCLUDE="Exclude"
 PLG_DEBUG_FIELD_LOG_CATEGORY_MODE_INCLUDE="Include"
 PLG_DEBUG_FIELD_LOG_CATEGORY_MODE_LABEL="Log Category Mode"
+PLG_DEBUG_FIELD_LOG_DEPRECATED_CORE_DESC="Only relevant for Joomla! core developers"
+PLG_DEBUG_FIELD_LOG_DEPRECATED_CORE_LABEL="Log Deprecated Core API"
 PLG_DEBUG_FIELD_LOG_DEPRECATED_LABEL="Log Deprecated API"
 PLG_DEBUG_FIELD_LOG_EVERYTHING_LABEL="Log Almost Everything"
 PLG_DEBUG_FIELD_LOG_PRIORITIES_ALERT="Alert"

diff --git a/composer.json b/composer.json
@@ -78,7 +78,8 @@
         "psr/link": "~1.0",
         "symfony/console": "3.4.*",
         "symfony/web-link": "3.4.*",
-        "symfony/yaml": "3.4.*"
+        "symfony/yaml": "3.4.*",
+        "maximebf/debugbar": "^1.15"
     },
     "require-dev": {
         "phpunit/phpunit": "~6.0",

diff --git a/composer.lock b/composer.lock
diff --git a/libraries/vendor/composer/ClassLoader.php b/libraries/vendor/composer/ClassLoader.php
@@ -379,9 +379,9 @@ private function findFileWithExtension($class, $ext)
                 $subPath = substr($subPath, 0, $lastPos);
                 $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
+                        $length = $this->prefixLengthsPsr4[$first][$search];
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
                             return $file;
                         }
                     }