jenkins-bot has submitted this change and it was merged.
Change subject: Move composer.json into repository root
......................................................................
Move composer.json into repository root
So we can use jenkins's standard php-composer-validate job.
The vendor/ directory will stay inside multiversion/.
Bug: T76621
Change-Id: I299c1cd5798f2ef7963b75cfef0b84b0533daf75
---
R composer.json
R composer.lock
M multiversion/vendor/autoload.php
M multiversion/vendor/composer/ClassLoader.php
M multiversion/vendor/composer/autoload_classmap.php
M multiversion/vendor/composer/autoload_namespaces.php
M multiversion/vendor/composer/autoload_psr4.php
M multiversion/vendor/composer/autoload_real.php
8 files changed, 12 insertions(+), 10 deletions(-)
Approvals:
BryanDavis: Looks good to me, but someone else must approve
Krinkle: Looks good to me, but someone else must approve
Reedy: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/multiversion/composer.json b/composer.json
similarity index 74%
rename from multiversion/composer.json
rename to composer.json
index 5dd1072..9ed4272 100644
--- a/multiversion/composer.json
+++ b/composer.json
@@ -6,6 +6,7 @@
},
"config": {
"optimize-autoloader": true,
- "prepend-autoloader": false
+ "prepend-autoloader": false,
+ "vendor-dir": "multiversion/vendor"
}
}
diff --git a/multiversion/composer.lock b/composer.lock
similarity index 97%
rename from multiversion/composer.lock
rename to composer.lock
index 38b75a4..e08fc17 100644
--- a/multiversion/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": "56b00614a2a6c02327bb0d7f1f1b674d",
+ "hash": "99c774fb23849c1620a28bb41a6e0a37",
"packages": [
{
"name": "wikimedia/cdb",
diff --git a/multiversion/vendor/autoload.php b/multiversion/vendor/autoload.php
index d95d13c..e06f23c 100644
--- a/multiversion/vendor/autoload.php
+++ b/multiversion/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInitedae43eb268ae2e5f5f72fb1a676053b::getLoader();
+return ComposerAutoloaderInitea7a8b034df32856d6c1587c046d5521::getLoader();
diff --git a/multiversion/vendor/composer/ClassLoader.php
b/multiversion/vendor/composer/ClassLoader.php
index 4a56396..70d78bc 100644
--- a/multiversion/vendor/composer/ClassLoader.php
+++ b/multiversion/vendor/composer/ClassLoader.php
@@ -59,6 +59,7 @@
if (!empty($this->prefixesPsr0)) {
return call_user_func_array('array_merge', $this->prefixesPsr0);
}
+
return array();
}
diff --git a/multiversion/vendor/composer/autoload_classmap.php
b/multiversion/vendor/composer/autoload_classmap.php
index 3784d10..aa4928b 100644
--- a/multiversion/vendor/composer/autoload_classmap.php
+++ b/multiversion/vendor/composer/autoload_classmap.php
@@ -3,7 +3,7 @@
// autoload_classmap.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
+$baseDir = dirname(dirname($vendorDir));
return array(
'Cdb\\Exception' => $vendorDir . '/wikimedia/cdb/src/Exception.php',
diff --git a/multiversion/vendor/composer/autoload_namespaces.php
b/multiversion/vendor/composer/autoload_namespaces.php
index b7fc012..4a9c20b 100644
--- a/multiversion/vendor/composer/autoload_namespaces.php
+++ b/multiversion/vendor/composer/autoload_namespaces.php
@@ -3,7 +3,7 @@
// autoload_namespaces.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
+$baseDir = dirname(dirname($vendorDir));
return array(
);
diff --git a/multiversion/vendor/composer/autoload_psr4.php
b/multiversion/vendor/composer/autoload_psr4.php
index b265c64..80607ee 100644
--- a/multiversion/vendor/composer/autoload_psr4.php
+++ b/multiversion/vendor/composer/autoload_psr4.php
@@ -3,7 +3,7 @@
// autoload_psr4.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
+$baseDir = dirname(dirname($vendorDir));
return array(
);
diff --git a/multiversion/vendor/composer/autoload_real.php
b/multiversion/vendor/composer/autoload_real.php
index 52bd4a6..688ba0f 100644
--- a/multiversion/vendor/composer/autoload_real.php
+++ b/multiversion/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInitedae43eb268ae2e5f5f72fb1a676053b
+class ComposerAutoloaderInitea7a8b034df32856d6c1587c046d5521
{
private static $loader;
@@ -19,9 +19,9 @@
return self::$loader;
}
-
spl_autoload_register(array('ComposerAutoloaderInitedae43eb268ae2e5f5f72fb1a676053b',
'loadClassLoader'), true, false);
+
spl_autoload_register(array('ComposerAutoloaderInitea7a8b034df32856d6c1587c046d5521',
'loadClassLoader'), true, false);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-
spl_autoload_unregister(array('ComposerAutoloaderInitedae43eb268ae2e5f5f72fb1a676053b',
'loadClassLoader'));
+
spl_autoload_unregister(array('ComposerAutoloaderInitea7a8b034df32856d6c1587c046d5521',
'loadClassLoader'));
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -44,7 +44,7 @@
}
}
-function composerRequireedae43eb268ae2e5f5f72fb1a676053b($file)
+function composerRequireea7a8b034df32856d6c1587c046d5521($file)
{
require $file;
}
--
To view, visit https://gerrit.wikimedia.org/r/180589
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I299c1cd5798f2ef7963b75cfef0b84b0533daf75
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
