jenkins-bot has submitted this change and it was merged.
Change subject: Update composer.json to point to Wikibase branch
......................................................................
Update composer.json to point to Wikibase branch
Change-Id: I95c50b659903a34ce60c910f1dbee7bba0b6b8ec
---
M composer.json
M composer.lock
M vendor/autoload.php
M vendor/composer/autoload_files.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
6 files changed, 271 insertions(+), 276 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 2541b8f..7772b3f 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,6 @@
{
"require": {
"php": ">=5.3.0",
- "wikibase/wikibase": "dev-master"
- },
- "config":{
- "github-oauth":{
- "github.com":"845d568f46a682fbf7fc5f92ed9397fc4ebdc072"
- }
+ "wikibase/wikibase": "dev-mw1.23-wmf19"
}
}
diff --git a/composer.lock b/composer.lock
index a987f80..f35124f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3,7 +3,7 @@
"This file locks the dependencies of your project to a known state",
"Read more about it at
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";
],
- "hash": "8e4f22bbedb9cd631ca304098ea9177c",
+ "hash": "de164cef49a0fb8bae337766eee5b346",
"packages": [
{
"name": "composer/installers",
@@ -846,7 +846,7 @@
},
{
"name": "wikibase/wikibase",
- "version": "dev-master",
+ "version": "dev-mw1.23-wmf19",
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 4ef2c9b..13e1e81 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInite6732e724b416b47945e63865180ffe4::getLoader();
+return ComposerAutoloaderInit69392322f28d031f830de9b3b1de47a0::getLoader();
diff --git a/vendor/composer/autoload_files.php
b/vendor/composer/autoload_files.php
index 31b1505..d4cbad0 100644
--- a/vendor/composer/autoload_files.php
+++ b/vendor/composer/autoload_files.php
@@ -12,12 +12,12 @@
$vendorDir . '/serialization/serialization/Serialization.php',
$vendorDir . '/diff/diff/Diff.php',
$vendorDir . '/data-values/javascript/DataValuesJavascript.php',
- $vendorDir . '/data-values/data-types/DataTypes.php',
$vendorDir . '/wikibase/data-model/WikibaseDataModel.php',
+ $baseDir . '/extensions/ValueView/ValueView.php',
+ $vendorDir . '/data-values/data-types/DataTypes.php',
+ $vendorDir . '/data-values/validators/Validators.php',
$vendorDir . '/data-values/time/Time.php',
$vendorDir . '/data-values/number/Number.php',
- $baseDir . '/extensions/ValueView/ValueView.php',
- $vendorDir . '/data-values/validators/Validators.php',
$vendorDir . '/data-values/geo/Geo.php',
$baseDir . '/extensions/Wikibase/Wikibase.composer.php',
);
diff --git a/vendor/composer/autoload_real.php
b/vendor/composer/autoload_real.php
index 20c77d2..2fa0ff0 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInite6732e724b416b47945e63865180ffe4
+class ComposerAutoloaderInit69392322f28d031f830de9b3b1de47a0
{
private static $loader;
@@ -19,9 +19,9 @@
return self::$loader;
}
-
spl_autoload_register(array('ComposerAutoloaderInite6732e724b416b47945e63865180ffe4',
'loadClassLoader'), true, true);
+
spl_autoload_register(array('ComposerAutoloaderInit69392322f28d031f830de9b3b1de47a0',
'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-
spl_autoload_unregister(array('ComposerAutoloaderInite6732e724b416b47945e63865180ffe4',
'loadClassLoader'));
+
spl_autoload_unregister(array('ComposerAutoloaderInit69392322f28d031f830de9b3b1de47a0',
'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
@@ -45,14 +45,14 @@
$includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) {
- composerRequiree6732e724b416b47945e63865180ffe4($file);
+ composerRequire69392322f28d031f830de9b3b1de47a0($file);
}
return $loader;
}
}
-function composerRequiree6732e724b416b47945e63865180ffe4($file)
+function composerRequire69392322f28d031f830de9b3b1de47a0($file)
{
require $file;
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 347fdfb..4d39320 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -86,33 +86,63 @@
]
},
{
- "name": "data-values/data-types",
- "version": "0.2",
- "version_normalized": "0.2.0.0",
+ "name": "wikibase/easyrdf_lite",
+ "version": "0.8.1",
+ "version_normalized": "0.8.1.0",
"source": {
"type": "git",
- "url": "https://github.com/wmde/DataTypes.git";,
- "reference": "6789703d97135238dcf90b5372f89ff6e080d7fe"
+ "url": "https://github.com/Wikidata/easyrdf_lite.git";,
+ "reference": "2f371b9447b7627e23b82cd31ade029659bb438c"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wmde/DataTypes/zipball/6789703d97135238dcf90b5372f89ff6e080d7fe";,
- "reference": "6789703d97135238dcf90b5372f89ff6e080d7fe",
+ "url":
"https://api.github.com/repos/Wikidata/easyrdf_lite/zipball/2f371b9447b7627e23b82cd31ade029659bb438c";,
+ "reference": "2f371b9447b7627e23b82cd31ade029659bb438c",
+ "shasum": ""
+ },
+ "time": "2014-01-29 22:43:55",
+ "type": "library",
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "EasyRdf_": "./"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "BSD"
+ ],
+ "description": "EasyRdf Lite is a customized version of EasyRdf",
+ "homepage": "https://github.com/Wikidata/easyrdf_lite";
+ },
+ {
+ "name": "diff/diff",
+ "version": "0.9",
+ "version_normalized": "0.9.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/wmde/Diff.git";,
+ "reference": "83bfc69a7e30fc3d2549b49ea7390169811afd99"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/wmde/Diff/zipball/83bfc69a7e30fc3d2549b49ea7390169811afd99";,
+ "reference": "83bfc69a7e30fc3d2549b49ea7390169811afd99",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
- "time": "2014-03-14 07:03:51",
+ "require-dev": {
+ "satooshi/php-coveralls": "dev-master"
+ },
+ "time": "2013-10-04 15:11:55",
"type": "library",
"installation-source": "dist",
"autoload": {
"files": [
- "DataTypes.php"
- ],
- "psr-4": {
- "DataTypes\\": "src/"
- }
+ "Diff.php"
+ ]
},
"notification-url": "https://packagist.org/downloads/";,
"license": [
@@ -126,11 +156,11 @@
"role": "Developer"
}
],
- "description": "PHP library defining the DataTypes\\DataType class of
which instances represent a type of value, such as \"positive integer\" or
\"percentage\".",
- "homepage": "https://github.com/wmde/DataTypes";,
+ "description": "Library for diffing, patching and representing
differences between complex objects",
+ "homepage": "https://github.com/wikimedia/mediawiki-extensions-Diff";,
"keywords": [
- "datatypes",
- "datavalues"
+ "diff",
+ "wikidata"
]
},
{
@@ -292,54 +322,6 @@
]
},
{
- "name": "diff/diff",
- "version": "0.9",
- "version_normalized": "0.9.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/wmde/Diff.git";,
- "reference": "83bfc69a7e30fc3d2549b49ea7390169811afd99"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/wmde/Diff/zipball/83bfc69a7e30fc3d2549b49ea7390169811afd99";,
- "reference": "83bfc69a7e30fc3d2549b49ea7390169811afd99",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.0"
- },
- "require-dev": {
- "satooshi/php-coveralls": "dev-master"
- },
- "time": "2013-10-04 15:11:55",
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "files": [
- "Diff.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/";,
- "license": [
- "GPL-2.0+"
- ],
- "authors": [
- {
- "name": "Jeroen De Dauw",
- "email": "[email protected]",
- "homepage": "http://jeroendedauw.com";,
- "role": "Developer"
- }
- ],
- "description": "Library for diffing, patching and representing
differences between complex objects",
- "homepage": "https://github.com/wikimedia/mediawiki-extensions-Diff";,
- "keywords": [
- "diff",
- "wikidata"
- ]
- },
- {
"name": "wikibase/data-model",
"version": "0.7.2",
"version_normalized": "0.7.2.0",
@@ -397,6 +379,158 @@
]
},
{
+ "name": "data-values/javascript",
+ "version": "0.3.1",
+ "version_normalized": "0.3.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/wmde/DataValuesJavascript.git";,
+ "reference": "3662a53a50b53d0ec11a8005a52109d3504a1b3e"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/wmde/DataValuesJavascript/zipball/3662a53a50b53d0ec11a8005a52109d3504a1b3e";,
+ "reference": "3662a53a50b53d0ec11a8005a52109d3504a1b3e",
+ "shasum": ""
+ },
+ "require": {
+ "composer/installers": ">=1.0.1"
+ },
+ "time": "2014-02-03 13:54:56",
+ "type": "library",
+ "installation-source": "dist",
+ "autoload": {
+ "files": [
+ "DataValuesJavascript.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "GPL-2.0+"
+ ],
+ "authors": [
+ {
+ "name": "Jeroen De Dauw",
+ "email": "[email protected]",
+ "homepage": "http://jeroendedauw.com";,
+ "role": "Developer"
+ },
+ {
+ "name": "Daniel Werner",
+ "email": "[email protected]",
+ "homepage": "https://www.mediawiki.org/wiki/User:Danwe";,
+ "role": "Developer"
+ },
+ {
+ "name": "H. Snater",
+ "email": "[email protected]",
+ "homepage": "http://www.snater.com";,
+ "role": "Developer"
+ }
+ ],
+ "description": "DataValues implementation in Javascript",
+ "keywords": [
+ "datavalues",
+ "wikidata"
+ ]
+ },
+ {
+ "name": "data-values/value-view",
+ "version": "0.3.3",
+ "version_normalized": "0.3.3.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/wmde/ValueView.git";,
+ "reference": "d660d990d8ad4b0bc4e0bacd4a0412e802693c00"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/wmde/ValueView/zipball/d660d990d8ad4b0bc4e0bacd4a0412e802693c00";,
+ "reference": "d660d990d8ad4b0bc4e0bacd4a0412e802693c00",
+ "shasum": ""
+ },
+ "require": {
+ "data-values/javascript": "~0.3.0",
+ "php": ">=5.3.0"
+ },
+ "time": "2014-02-24 15:07:42",
+ "type": "mediawiki-extension",
+ "installation-source": "dist",
+ "autoload": {
+ "files": [
+ "ValueView.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "GPL-2.0+"
+ ],
+ "authors": [
+ {
+ "name": "Daniel Werner",
+ "email": "[email protected]",
+ "homepage": "https://www.mediawiki.org/wiki/User:Danwe";,
+ "role": "Developer"
+ },
+ {
+ "name": "H. Snater",
+ "email": "[email protected]",
+ "homepage": "http://www.snater.com";,
+ "role": "Developer"
+ }
+ ],
+ "description": "Provides JS widgets to edit values defined by the
DataValues library",
+ "homepage": "https://www.mediawiki.org/wiki/Extension:ValueView";
+ },
+ {
+ "name": "data-values/data-types",
+ "version": "0.2",
+ "version_normalized": "0.2.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/wmde/DataTypes.git";,
+ "reference": "6789703d97135238dcf90b5372f89ff6e080d7fe"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/wmde/DataTypes/zipball/6789703d97135238dcf90b5372f89ff6e080d7fe";,
+ "reference": "6789703d97135238dcf90b5372f89ff6e080d7fe",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "time": "2014-03-14 07:03:51",
+ "type": "library",
+ "installation-source": "dist",
+ "autoload": {
+ "files": [
+ "DataTypes.php"
+ ],
+ "psr-4": {
+ "DataTypes\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "GPL-2.0+"
+ ],
+ "authors": [
+ {
+ "name": "Jeroen De Dauw",
+ "email": "[email protected]",
+ "homepage": "http://jeroendedauw.com";,
+ "role": "Developer"
+ }
+ ],
+ "description": "PHP library defining the DataTypes\\DataType class of
which instances represent a type of value, such as \"positive integer\" or
\"percentage\".",
+ "homepage": "https://github.com/wmde/DataTypes";,
+ "keywords": [
+ "datatypes",
+ "datavalues"
+ ]
+ },
+ {
"name": "data-values/interfaces",
"version": "0.1.2",
"version_normalized": "0.1.2.0",
@@ -449,6 +583,64 @@
"valueformatters",
"valueparsers",
"valuevalidators",
+ "wikidata"
+ ]
+ },
+ {
+ "name": "data-values/validators",
+ "version": "0.1",
+ "version_normalized": "0.1.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/DataValues/Validators.git";,
+ "reference": "bf04780e44e5b2694e2e85c63a641ba852396ee7"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/DataValues/Validators/zipball/bf04780e44e5b2694e2e85c63a641ba852396ee7";,
+ "reference": "bf04780e44e5b2694e2e85c63a641ba852396ee7",
+ "shasum": ""
+ },
+ "require": {
+ "data-values/data-values": "~0.1",
+ "data-values/interfaces": "~0.1",
+ "php": ">=5.3.0"
+ },
+ "time": "2013-11-17 19:31:21",
+ "type": "library",
+ "installation-source": "dist",
+ "autoload": {
+ "files": [
+ "Validators.php"
+ ],
+ "psr-0": {
+ "ValueValidators\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "GPL-2.0+"
+ ],
+ "authors": [
+ {
+ "name": "Jeroen De Dauw",
+ "email": "[email protected]",
+ "homepage": "http://jeroendedauw.com";,
+ "role": "Developer"
+ },
+ {
+ "name": "The Wikidata team",
+ "role": "Developer"
+ }
+ ],
+ "description": "Common ValueValidator implementations",
+ "homepage": "https://github.com/DataValues/Validators";,
+ "keywords": [
+ "datavalues",
+ "validation",
+ "validators",
+ "valueformatters",
+ "valueparsers",
"wikidata"
]
},
@@ -618,198 +810,6 @@
]
},
{
- "name": "wikibase/easyrdf_lite",
- "version": "0.8.1",
- "version_normalized": "0.8.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/Wikidata/easyrdf_lite.git";,
- "reference": "2f371b9447b7627e23b82cd31ade029659bb438c"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/Wikidata/easyrdf_lite/zipball/2f371b9447b7627e23b82cd31ade029659bb438c";,
- "reference": "2f371b9447b7627e23b82cd31ade029659bb438c",
- "shasum": ""
- },
- "time": "2014-01-29 22:43:55",
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "EasyRdf_": "./"
- }
- },
- "notification-url": "https://packagist.org/downloads/";,
- "license": [
- "BSD"
- ],
- "description": "EasyRdf Lite is a customized version of EasyRdf",
- "homepage": "https://github.com/Wikidata/easyrdf_lite";
- },
- {
- "name": "data-values/javascript",
- "version": "0.3.1",
- "version_normalized": "0.3.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/wmde/DataValuesJavascript.git";,
- "reference": "3662a53a50b53d0ec11a8005a52109d3504a1b3e"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/wmde/DataValuesJavascript/zipball/3662a53a50b53d0ec11a8005a52109d3504a1b3e";,
- "reference": "3662a53a50b53d0ec11a8005a52109d3504a1b3e",
- "shasum": ""
- },
- "require": {
- "composer/installers": ">=1.0.1"
- },
- "time": "2014-02-03 13:54:56",
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "files": [
- "DataValuesJavascript.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/";,
- "license": [
- "GPL-2.0+"
- ],
- "authors": [
- {
- "name": "Jeroen De Dauw",
- "email": "[email protected]",
- "homepage": "http://jeroendedauw.com";,
- "role": "Developer"
- },
- {
- "name": "Daniel Werner",
- "email": "[email protected]",
- "homepage": "https://www.mediawiki.org/wiki/User:Danwe";,
- "role": "Developer"
- },
- {
- "name": "H. Snater",
- "email": "[email protected]",
- "homepage": "http://www.snater.com";,
- "role": "Developer"
- }
- ],
- "description": "DataValues implementation in Javascript",
- "keywords": [
- "datavalues",
- "wikidata"
- ]
- },
- {
- "name": "data-values/value-view",
- "version": "0.3.3",
- "version_normalized": "0.3.3.0",
- "source": {
- "type": "git",
- "url": "https://github.com/wmde/ValueView.git";,
- "reference": "d660d990d8ad4b0bc4e0bacd4a0412e802693c00"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/wmde/ValueView/zipball/d660d990d8ad4b0bc4e0bacd4a0412e802693c00";,
- "reference": "d660d990d8ad4b0bc4e0bacd4a0412e802693c00",
- "shasum": ""
- },
- "require": {
- "data-values/javascript": "~0.3.0",
- "php": ">=5.3.0"
- },
- "time": "2014-02-24 15:07:42",
- "type": "mediawiki-extension",
- "installation-source": "dist",
- "autoload": {
- "files": [
- "ValueView.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/";,
- "license": [
- "GPL-2.0+"
- ],
- "authors": [
- {
- "name": "Daniel Werner",
- "email": "[email protected]",
- "homepage": "https://www.mediawiki.org/wiki/User:Danwe";,
- "role": "Developer"
- },
- {
- "name": "H. Snater",
- "email": "[email protected]",
- "homepage": "http://www.snater.com";,
- "role": "Developer"
- }
- ],
- "description": "Provides JS widgets to edit values defined by the
DataValues library",
- "homepage": "https://www.mediawiki.org/wiki/Extension:ValueView";
- },
- {
- "name": "data-values/validators",
- "version": "0.1",
- "version_normalized": "0.1.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/DataValues/Validators.git";,
- "reference": "bf04780e44e5b2694e2e85c63a641ba852396ee7"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/DataValues/Validators/zipball/bf04780e44e5b2694e2e85c63a641ba852396ee7";,
- "reference": "bf04780e44e5b2694e2e85c63a641ba852396ee7",
- "shasum": ""
- },
- "require": {
- "data-values/data-values": "~0.1",
- "data-values/interfaces": "~0.1",
- "php": ">=5.3.0"
- },
- "time": "2013-11-17 19:31:21",
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "files": [
- "Validators.php"
- ],
- "psr-0": {
- "ValueValidators\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/";,
- "license": [
- "GPL-2.0+"
- ],
- "authors": [
- {
- "name": "Jeroen De Dauw",
- "email": "[email protected]",
- "homepage": "http://jeroendedauw.com";,
- "role": "Developer"
- },
- {
- "name": "The Wikidata team",
- "role": "Developer"
- }
- ],
- "description": "Common ValueValidator implementations",
- "homepage": "https://github.com/DataValues/Validators";,
- "keywords": [
- "datavalues",
- "validation",
- "validators",
- "valueformatters",
- "valueparsers",
- "wikidata"
- ]
- },
- {
"name": "data-values/geo",
"version": "0.1.2",
"version_normalized": "0.1.2.0",
@@ -872,8 +872,8 @@
},
{
"name": "wikibase/wikibase",
- "version": "dev-master",
- "version_normalized": "9999999-dev",
+ "version": "dev-mw1.23-wmf19",
+ "version_normalized": "dev-mw1.23-wmf19",
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
--
To view, visit https://gerrit.wikimedia.org/r/119739
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I95c50b659903a34ce60c910f1dbee7bba0b6b8ec
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: mw1.23-wmf19
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
