jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Use classmap-authoritative setting"
......................................................................
Revert "Use classmap-authoritative setting"
Breaks the beta cluster scap updating process with:
$ mwscript mergeMessageFileList.php --wiki=eowiki \
--list-file="/srv/mediawiki-staging/wmf-config/extension-list"
PHP Fatal error: Call to undefined method
Composer\Autoload\ClassLoader::setClassMapAuthoritative()
in /mnt/srv/mediawiki-staging/php-master/vendor/composer/autoload_real.php on
line 41
This reverts commit aa275e8274614ea56c5ec5cd338f78ed8886a491.
Bug: T85182
Change-Id: I31ec6dd267ecd9f8733615da274eee1905a2822a
---
M composer.json
M composer.lock
M composer/ClassLoader.php
M composer/autoload_real.php
4 files changed, 1 insertion(+), 30 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index d060720..94cacaf 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,6 @@
"prefer-stable": true,
"config": {
"autoloader-suffix": "_mediawiki_vendor",
- "classmap-authoritative": true,
"preferred-install": "dist",
"vendor-dir": ".",
"prepend-autoloader": false,
diff --git a/composer.lock b/composer.lock
index 2e96d1f..30f85bd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
- "hash": "d9d18bb786b26686b4934fef5d3831ec",
+ "hash": "22e9c4f623b4931a2a8f04f97f38d84c",
"packages": [
{
"name": "Plancake/EmailParser",
@@ -465,7 +465,6 @@
"plancake/emailparser": 20
},
"prefer-stable": true,
- "prefer-lowest": false,
"platform": {
"php": ">=5.3.3"
},
diff --git a/composer/ClassLoader.php b/composer/ClassLoader.php
index 5e1469e..70d78bc 100644
--- a/composer/ClassLoader.php
+++ b/composer/ClassLoader.php
@@ -54,8 +54,6 @@
private $useIncludePath = false;
private $classMap = array();
- private $classMapAuthoritative = false;
-
public function getPrefixes()
{
if (!empty($this->prefixesPsr0)) {
@@ -251,27 +249,6 @@
}
/**
- * Turns off searching the prefix and fallback directories for classes
- * that have not been registered with the class map.
- *
- * @param bool $classMapAuthoritative
- */
- public function setClassMapAuthoritative($classMapAuthoritative)
- {
- $this->classMapAuthoritative = $classMapAuthoritative;
- }
-
- /**
- * Should class lookup fail if not found in the current class map?
- *
- * @return bool
- */
- public function isClassMapAuthoritative()
- {
- return $this->classMapAuthoritative;
- }
-
- /**
* Registers this instance as an autoloader.
*
* @param bool $prepend Whether to prepend the autoloader or not
@@ -321,9 +298,6 @@
// class map lookup
if (isset($this->classMap[$class])) {
return $this->classMap[$class];
- }
- if ($this->classMapAuthoritative) {
- return false;
}
$file = $this->findFileWithExtension($class, '.php');
diff --git a/composer/autoload_real.php b/composer/autoload_real.php
index 10158fe..ad07dbd 100644
--- a/composer/autoload_real.php
+++ b/composer/autoload_real.php
@@ -38,7 +38,6 @@
$loader->addClassMap($classMap);
}
- $loader->setClassMapAuthoritative(true);
$loader->register(false);
return $loader;
--
To view, visit https://gerrit.wikimedia.org/r/187656
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I31ec6dd267ecd9f8733615da274eee1905a2822a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vendor
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Tim Starling <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
