From: Mark A. Hershberger <mah@nichework.com>
Date: Sun, 20 May 2018 14:51:34 +0000 (-0400)
Subject: Don't require trailing slash in PSR-4 autoloader directory
X-Git-Tag: 1.31.0-rc.1~5
X-Git-Url: http://git.cyclocoop.org/%24dirpuce/%27%241/%40%20%27entree_login%27%20=%3E%20%27Your%20login%27%2C%20%27entree_login_connexion_1%27%20=%3E%20%27Connection%20login%27%2C%20%27entree_login_connexion_2%27%20=%3E%20%27%28Sometimes%20matches%20your%20FTP%20account%20login%20and%20sometimes%20left%20empty%29%27%2C-%27entree_login_ldap%27%20=%3E%20%27Initial%20LDAP%20login%27%2C%20%27entree_mot_passe%27%20=%3E%20%27Your%20password%27%2C%20%27entree_mot_passe_1%27%20=%3E%20%27Password%27%2C%20%27entree_mot_passe_2%27%20=%3E%20%27%28Sometimes%20matches%20your%20FTP%20access%20password%20and%20sometimes%20left%20empty%29%27%2C%40%40%20-150%2C7%20%20121%2C7%20%40%40%20Do%20not%20submit%20this%20import%20request.%3Cp%3EFor%20more%20information%2C%20please%20see%20%3Ca%20href=?a=commitdiff_plain;h=8539ecb93dd7beaa4c422859baf233f0478f00d9;p=lhc%2Fweb%2Fwiklou.git

Don't require trailing slash in PSR-4 autoloader directory

This avoids the confusing error “Fatal error: Uncaught
InvalidArgumentException” or similar.

Bug: T195211
Change-Id: Ifda59a26f8bd968a2d0acbdb157d81dc0bf6aab4
(cherry picked from commit 3b85e362a4098832a08529adc89571a86bf6e9a2)
---

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 52410fede8..6e7705653f 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -82,7 +82,7 @@ class AutoLoader {
 				if ( isset( self::$psr4Namespaces[$prefix] ) ) {
 					$relativeClass = substr( $className, $pos + 1 );
 					// Build the expected filename, and see if it exists
-					$file = self::$psr4Namespaces[$prefix] .
+					$file = self::$psr4Namespaces[$prefix] . '/' .
 						str_replace( '\\', '/', $relativeClass ) . '.php';
 					if ( file_exists( $file ) ) {
 						$filename = $file;