[MediaWiki-commits] [Gerrit] Bring in cdb library via composer - change (operations/mediawiki-config)

2014-12-02 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Bring in cdb library via composer
..


Bring in cdb library via composer

Bug: T1338
Change-Id: I2674f5c6aaaf853a415948b4a46c3ad512f8c260
---
D multiversion/Cdb.php
M multiversion/MWMultiVersion.php
A multiversion/composer.json
A multiversion/composer.lock
M multiversion/getMWVersion.php
M multiversion/refreshWikiversionsCDB
A multiversion/vendor/autoload.php
A multiversion/vendor/cdb/cdb/.gitignore
A multiversion/vendor/cdb/cdb/.gitreview
A multiversion/vendor/cdb/cdb/COPYING
A multiversion/vendor/cdb/cdb/README.md
A multiversion/vendor/cdb/cdb/composer.json
R multiversion/vendor/cdb/cdb/src/Exception.php
R multiversion/vendor/cdb/cdb/src/Reader.php
R multiversion/vendor/cdb/cdb/src/Reader/DBA.php
R multiversion/vendor/cdb/cdb/src/Reader/PHP.php
R multiversion/vendor/cdb/cdb/src/Util.php
R multiversion/vendor/cdb/cdb/src/Writer.php
R multiversion/vendor/cdb/cdb/src/Writer/DBA.php
R multiversion/vendor/cdb/cdb/src/Writer/PHP.php
A multiversion/vendor/cdb/cdb/test/CdbTest.php
A multiversion/vendor/composer/ClassLoader.php
A multiversion/vendor/composer/autoload_classmap.php
A multiversion/vendor/composer/autoload_namespaces.php
A multiversion/vendor/composer/autoload_psr4.php
A multiversion/vendor/composer/autoload_real.php
A multiversion/vendor/composer/installed.json
M wmf-config/missing.php
28 files changed, 1,171 insertions(+), 56 deletions(-)

Approvals:
  BryanDavis: Looks good to me, but someone else must approve
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/multiversion/Cdb.php b/multiversion/Cdb.php
deleted file mode 100644
index b67cf62..000
--- a/multiversion/Cdb.php
+++ /dev/null
@@ -1,10 +0,0 @@
-?php
-
-require_once __DIR__ . '/cdb/CdbException.php';
-require_once __DIR__ . '/cdb/CdbFunctions.php';
-require_once __DIR__ . '/cdb/CdbReader.php';
-require_once __DIR__ . '/cdb/CdbReaderDBA.php';
-require_once __DIR__ . '/cdb/CdbReaderPHP.php';
-require_once __DIR__ . '/cdb/CdbWriter.php';
-require_once __DIR__ . '/cdb/CdbWriterDBA.php';
-require_once __DIR__ . '/cdb/CdbWriterPHP.php';
diff --git a/multiversion/MWMultiVersion.php b/multiversion/MWMultiVersion.php
index dc3e84b..501c0cb 100644
--- a/multiversion/MWMultiVersion.php
+++ b/multiversion/MWMultiVersion.php
@@ -1,7 +1,10 @@
 ?php
 require_once( __DIR__ . '/defines.php' );
 require_once( __DIR__ . '/MWRealm.php' );
-require_once( __DIR__ . '/Cdb.php' );
+require_once( __DIR__ . '/vendor/autoload.php' );
+
+use Cdb\Exception as CdbException;
+use Cdb\Reader as CdbReader;
 
 /**
  * Class to handle basic information related to what
diff --git a/multiversion/composer.json b/multiversion/composer.json
new file mode 100644
index 000..c7ff6c8
--- /dev/null
+++ b/multiversion/composer.json
@@ -0,0 +1,7 @@
+{
+   name: wikimedia/mediawiki-config,
+   description: MediaWiki configuration for the Wikimedia farm,
+   require: {
+   cdb/cdb: 1.0.0
+   }
+}
diff --git a/multiversion/composer.lock b/multiversion/composer.lock
new file mode 100644
index 000..c7f9013
--- /dev/null
+++ b/multiversion/composer.lock
@@ -0,0 +1,61 @@
+{
+_readme: [
+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;,
+This file is @generated automatically
+],
+hash: f21b78c0e307068ef3aace0dba433201,
+packages: [
+{
+name: cdb/cdb,
+version: 1.0.0,
+source: {
+type: git,
+url: https://github.com/wikimedia/cdb.git;,
+reference: 918601ea3d31b8c37312e9c0e54446aa8bfb3425
+},
+dist: {
+type: zip,
+url: 
https://api.github.com/repos/wikimedia/cdb/zipball/918601ea3d31b8c37312e9c0e54446aa8bfb3425;,
+reference: 918601ea3d31b8c37312e9c0e54446aa8bfb3425,
+shasum: 
+},
+require: {
+php: =5.3.2
+},
+require-dev: {
+phpunit/phpunit: *
+},
+type: library,
+autoload: {
+classmap: [
+src/
+]
+},
+notification-url: https://packagist.org/downloads/;,
+license: [
+GPLv2
+],
+authors: [
+{
+name: Tim Starling,
+email: tstarl...@wikimedia.org
+},
+{
+name: Chad Horohoe,
+email: c...@wikimedia.org
+}
+],
+description: Constant Database (CDB) wrapper library for PHP. 
Provides pure-PHP fallback when dba_* functions are absent.,
+homepage:

[MediaWiki-commits] [Gerrit] Bring in cdb library via composer - change (operations/mediawiki-config)

2014-11-25 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/175796

Change subject: Bring in cdb library via composer
..

Bring in cdb library via composer

Bug: T1338
Change-Id: I2674f5c6aaaf853a415948b4a46c3ad512f8c260
---
D multiversion/Cdb.php
M multiversion/MWMultiVersion.php
A multiversion/composer.json
A multiversion/composer.lock
M multiversion/getMWVersion.php
M multiversion/refreshWikiversionsCDB
A multiversion/vendor/autoload.php
A multiversion/vendor/cdb/cdb/.gitignore
A multiversion/vendor/cdb/cdb/.gitreview
A multiversion/vendor/cdb/cdb/COPYING
A multiversion/vendor/cdb/cdb/README.md
A multiversion/vendor/cdb/cdb/composer.json
R multiversion/vendor/cdb/cdb/src/Exception.php
R multiversion/vendor/cdb/cdb/src/Reader.php
R multiversion/vendor/cdb/cdb/src/Reader/DBA.php
R multiversion/vendor/cdb/cdb/src/Reader/PHP.php
R multiversion/vendor/cdb/cdb/src/Util.php
R multiversion/vendor/cdb/cdb/src/Writer.php
R multiversion/vendor/cdb/cdb/src/Writer/DBA.php
R multiversion/vendor/cdb/cdb/src/Writer/PHP.php
A multiversion/vendor/cdb/cdb/test/CdbTest.php
A multiversion/vendor/composer/ClassLoader.php
A multiversion/vendor/composer/autoload_classmap.php
A multiversion/vendor/composer/autoload_namespaces.php
A multiversion/vendor/composer/autoload_psr4.php
A multiversion/vendor/composer/autoload_real.php
A multiversion/vendor/composer/installed.json
M wmf-config/missing.php
28 files changed, 1,171 insertions(+), 56 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/96/175796/1

diff --git a/multiversion/Cdb.php b/multiversion/Cdb.php
deleted file mode 100644
index b67cf62..000
--- a/multiversion/Cdb.php
+++ /dev/null
@@ -1,10 +0,0 @@
-?php
-
-require_once __DIR__ . '/cdb/CdbException.php';
-require_once __DIR__ . '/cdb/CdbFunctions.php';
-require_once __DIR__ . '/cdb/CdbReader.php';
-require_once __DIR__ . '/cdb/CdbReaderDBA.php';
-require_once __DIR__ . '/cdb/CdbReaderPHP.php';
-require_once __DIR__ . '/cdb/CdbWriter.php';
-require_once __DIR__ . '/cdb/CdbWriterDBA.php';
-require_once __DIR__ . '/cdb/CdbWriterPHP.php';
diff --git a/multiversion/MWMultiVersion.php b/multiversion/MWMultiVersion.php
index f3aec00..0de13ac 100644
--- a/multiversion/MWMultiVersion.php
+++ b/multiversion/MWMultiVersion.php
@@ -1,7 +1,10 @@
 ?php
 require_once( __DIR__ . '/defines.php' );
 require_once( __DIR__ . '/MWRealm.php' );
-require_once( __DIR__ . '/Cdb.php' );
+require_once( __DIR__ . '/vendor/autoload.php' );
+
+use Cdb\Exception as CdbException;
+use Cdb\Reader as CdbReader;
 
 /**
  * Class to handle basic information related to what
diff --git a/multiversion/composer.json b/multiversion/composer.json
new file mode 100644
index 000..c7ff6c8
--- /dev/null
+++ b/multiversion/composer.json
@@ -0,0 +1,7 @@
+{
+   name: wikimedia/mediawiki-config,
+   description: MediaWiki configuration for the Wikimedia farm,
+   require: {
+   cdb/cdb: 1.0.0
+   }
+}
diff --git a/multiversion/composer.lock b/multiversion/composer.lock
new file mode 100644
index 000..c7f9013
--- /dev/null
+++ b/multiversion/composer.lock
@@ -0,0 +1,61 @@
+{
+_readme: [
+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;,
+This file is @generated automatically
+],
+hash: f21b78c0e307068ef3aace0dba433201,
+packages: [
+{
+name: cdb/cdb,
+version: 1.0.0,
+source: {
+type: git,
+url: https://github.com/wikimedia/cdb.git;,
+reference: 918601ea3d31b8c37312e9c0e54446aa8bfb3425
+},
+dist: {
+type: zip,
+url: 
https://api.github.com/repos/wikimedia/cdb/zipball/918601ea3d31b8c37312e9c0e54446aa8bfb3425;,
+reference: 918601ea3d31b8c37312e9c0e54446aa8bfb3425,
+shasum: 
+},
+require: {
+php: =5.3.2
+},
+require-dev: {
+phpunit/phpunit: *
+},
+type: library,
+autoload: {
+classmap: [
+src/
+]
+},
+notification-url: https://packagist.org/downloads/;,
+license: [
+GPLv2
+],
+authors: [
+{
+name: Tim Starling,
+email: tstarl...@wikimedia.org
+},
+{
+name: Chad Horohoe,
+email: c...@wikimedia.org
+}
+],
+description: Constant Database (CDB) wrapper library for PHP. 
Provides pure-PHP fallback when dba_* functions are absent.,
+homepage: