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..0000000
--- 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 0000000..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 0000000..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": "https://www.mediawiki.org/wiki/CDB";,
+ "time": "2014-11-12 19:03:26"
+ }
+ ],
+ "packages-dev": [],
+ "aliases": [],
+ "minimum-stability": "stable",
+ "stability-flags": [],
+ "prefer-stable": false,
+ "platform": [],
+ "platform-dev": []
+}
diff --git a/multiversion/getMWVersion.php b/multiversion/getMWVersion.php
index 282cb16..5667f3a 100644
--- a/multiversion/getMWVersion.php
+++ b/multiversion/getMWVersion.php
@@ -3,7 +3,10 @@
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;
/**
* This script prints the MW version associated with a specified wikidb.
diff --git a/multiversion/refreshWikiversionsCDB
b/multiversion/refreshWikiversionsCDB
index 4816a95..cb7adf7 100755
--- a/multiversion/refreshWikiversionsCDB
+++ b/multiversion/refreshWikiversionsCDB
@@ -6,7 +6,10 @@
require_once( __DIR__ . '/defines.php' );
require_once( __DIR__ . '/MWWikiversions.php' );
require_once( __DIR__ . '/MWRealm.php' );
-require_once( __DIR__ . '/Cdb.php' );
+require_once( __DIR__ . '/vendor/autoload.php' );
+
+use Cdb\Exception as CdbException;
+use Cdb\Writer as CdbWriter;
/*
* Populate wikiversions.cdb file using all the items in wikiversions.json
diff --git a/multiversion/vendor/autoload.php b/multiversion/vendor/autoload.php
new file mode 100644
index 0000000..422dc17
--- /dev/null
+++ b/multiversion/vendor/autoload.php
@@ -0,0 +1,7 @@
+<?php
+
+// autoload.php @generated by Composer
+
+require_once __DIR__ . '/composer' . '/autoload_real.php';
+
+return ComposerAutoloaderInit69905fe98d44fa6f371f0023e4aa4797::getLoader();
diff --git a/multiversion/vendor/cdb/cdb/.gitignore
b/multiversion/vendor/cdb/cdb/.gitignore
new file mode 100644
index 0000000..d1502b0
--- /dev/null
+++ b/multiversion/vendor/cdb/cdb/.gitignore
@@ -0,0 +1,2 @@
+vendor/
+composer.lock
diff --git a/multiversion/vendor/cdb/cdb/.gitreview
b/multiversion/vendor/cdb/cdb/.gitreview
new file mode 100644
index 0000000..5eb18ac
--- /dev/null
+++ b/multiversion/vendor/cdb/cdb/.gitreview
@@ -0,0 +1,6 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=cdb.git
+defaultbranch=master
+defaultrebase=0
diff --git a/multiversion/vendor/cdb/cdb/COPYING
b/multiversion/vendor/cdb/cdb/COPYING
new file mode 100644
index 0000000..019694a
--- /dev/null
+++ b/multiversion/vendor/cdb/cdb/COPYING
@@ -0,0 +1,342 @@
+== GNU GENERAL PUBLIC LICENSE ==
+
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+=== Preamble ===
+
+The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+== TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION ==
+
+'''0.''' This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+'''1.''' You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+'''2.''' You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ '''a)''' You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ '''b)''' You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ '''c)''' If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+'''3.''' You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ '''a)''' Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ '''b)''' Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ '''c)''' Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+'''4.''' You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+'''5.''' You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+'''6.''' Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+'''7.''' If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+'''8.''' If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+'''9.''' The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+'''10.''' If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+=== NO WARRANTY ===
+
+'''11.''' BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+'''12.''' IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ '''END OF TERMS AND CONDITIONS'''
+
+== How to Apply These Terms to Your New Programs ==
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show
w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/multiversion/vendor/cdb/cdb/README.md
b/multiversion/vendor/cdb/cdb/README.md
new file mode 100644
index 0000000..1138265
--- /dev/null
+++ b/multiversion/vendor/cdb/cdb/README.md
@@ -0,0 +1,9 @@
+CDB functions for PHP
+=====================
+
+This library wraps the constant database (CDB) functionality exposed in PHP
+via the dba_* functions. In cases where dba_* functions are not present or
+are not compiled with CDB support, a pure-PHP implementation is provided for
+falling back.
+
+http://cr.yp.to/cdb.html
diff --git a/multiversion/vendor/cdb/cdb/composer.json
b/multiversion/vendor/cdb/cdb/composer.json
new file mode 100644
index 0000000..fed2a4f
--- /dev/null
+++ b/multiversion/vendor/cdb/cdb/composer.json
@@ -0,0 +1,26 @@
+{
+ "name": "cdb/cdb",
+ "description": "Constant Database (CDB) wrapper library for PHP. Provides
pure-PHP fallback when dba_* functions are absent.",
+ "license": "GPLv2",
+ "homepage": "https://www.mediawiki.org/wiki/CDB";,
+ "authors": [
+ {
+ "name": "Tim Starling",
+ "email": "tstarl...@wikimedia.org"
+ },
+ {
+ "name": "Chad Horohoe",
+ "email": "c...@wikimedia.org"
+ }
+ ],
+ "minimum-stability": "dev",
+ "require": {
+ "php": ">=5.3.2"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "*"
+ },
+ "autoload": {
+ "classmap": ["src/"]
+ }
+}
diff --git a/multiversion/cdb/CdbException.php
b/multiversion/vendor/cdb/cdb/src/Exception.php
similarity index 88%
rename from multiversion/cdb/CdbException.php
rename to multiversion/vendor/cdb/cdb/src/Exception.php
index 6cda529..76a59da 100644
--- a/multiversion/cdb/CdbException.php
+++ b/multiversion/vendor/cdb/cdb/src/Exception.php
@@ -1,4 +1,7 @@
<?php
+
+namespace Cdb;
+
/**
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,7 +23,6 @@
/**
* Exception for Cdb errors.
- * This explicitly doesn't subclass MWException to encourage reuse.
*/
-class CdbException extends Exception {
+class Exception extends \Exception {
}
diff --git a/multiversion/cdb/CdbReader.php
b/multiversion/vendor/cdb/cdb/src/Reader.php
similarity index 93%
rename from multiversion/cdb/CdbReader.php
rename to multiversion/vendor/cdb/cdb/src/Reader.php
index 0ca9b9d..2df06ab 100644
--- a/multiversion/cdb/CdbReader.php
+++ b/multiversion/vendor/cdb/cdb/src/Reader.php
@@ -1,4 +1,7 @@
<?php
+
+namespace Cdb;
+
/**
* Native CDB file reader and writer.
*
@@ -25,7 +28,7 @@
* Native and pure PHP implementations are provided.
* http://cr.yp.to/cdb.html
*/
-abstract class CdbReader {
+abstract class Reader {
/**
* The file handle
*/
@@ -36,12 +39,12 @@
*
* @param string $fileName
*
- * @return CdbReader
+ * @return Reader
*/
public static function open( $fileName ) {
return self::haveExtension() ?
- new CdbReaderDBA( $fileName ) :
- new CdbReaderPHP( $fileName );
+ new Reader\DBA( $fileName ) :
+ new Reader\PHP( $fileName );
}
/**
diff --git a/multiversion/cdb/CdbReaderDBA.php
b/multiversion/vendor/cdb/cdb/src/Reader/DBA.php
similarity index 87%
rename from multiversion/cdb/CdbReaderDBA.php
rename to multiversion/vendor/cdb/cdb/src/Reader/DBA.php
index e0cab73..838bf6e 100644
--- a/multiversion/cdb/CdbReaderDBA.php
+++ b/multiversion/vendor/cdb/cdb/src/Reader/DBA.php
@@ -1,4 +1,9 @@
<?php
+
+namespace Cdb\Reader;
+use Cdb\Exception;
+use Cdb\Reader;
+
/**
* DBA-based CDB reader/writer
*
@@ -23,11 +28,11 @@
/**
* Reader class which uses the DBA extension
*/
-class CdbReaderDBA extends CdbReader {
+class DBA extends Reader {
public function __construct( $fileName ) {
$this->handle = dba_open( $fileName, 'r-', 'cdb' );
if ( !$this->handle ) {
- throw new CdbException( 'Unable to open CDB file "' .
$fileName . '"' );
+ throw new Exception( 'Unable to open CDB file "' .
$fileName . '"' );
}
}
diff --git a/multiversion/cdb/CdbReaderPHP.php
b/multiversion/vendor/cdb/cdb/src/Reader/PHP.php
similarity index 90%
rename from multiversion/cdb/CdbReaderPHP.php
rename to multiversion/vendor/cdb/cdb/src/Reader/PHP.php
index e448414..57b7d8c 100644
--- a/multiversion/cdb/CdbReaderPHP.php
+++ b/multiversion/vendor/cdb/cdb/src/Reader/PHP.php
@@ -1,4 +1,10 @@
<?php
+
+namespace Cdb\Reader;
+use Cdb\Exception;
+use Cdb\Reader;
+use Cdb\Util;
+
/**
* This is a port of D.J. Bernstein's CDB to PHP. It's based on the copy that
* appears in PHP 5.3. Changes are:
@@ -27,7 +33,7 @@
/**
* CDB reader class
*/
-class CdbReaderPHP extends CdbReader {
+class PHP extends Reader {
/** The filename */
protected $fileName;
@@ -54,13 +60,13 @@
/**
* @param string $fileName
- * @throws CdbException
+ * @throws Exception
*/
public function __construct( $fileName ) {
$this->fileName = $fileName;
$this->handle = fopen( $fileName, 'rb' );
if ( !$this->handle ) {
- throw new CdbException( 'Unable to open CDB file "' .
$this->fileName . '".' );
+ throw new Exception( 'Unable to open CDB file "' .
$this->fileName . '".' );
}
$this->findStart();
}
@@ -80,9 +86,9 @@
// strval is required
if ( $this->find( strval( $key ) ) ) {
return $this->read( $this->dlen, $this->dpos );
- } else {
- return false;
}
+
+ return false;
}
/**
@@ -101,7 +107,7 @@
}
/**
- * @throws CdbException
+ * @throws Exception
* @param int $length
* @param int $pos
* @return string
@@ -109,7 +115,7 @@
protected function read( $length, $pos ) {
if ( fseek( $this->handle, $pos ) == -1 ) {
// This can easily happen if the internal pointers are
incorrect
- throw new CdbException(
+ throw new Exception(
'Seek failed, file "' . $this->fileName . '"
may be corrupted.' );
}
@@ -119,7 +125,7 @@
$buf = fread( $this->handle, $length );
if ( $buf === false || strlen( $buf ) !== $length ) {
- throw new CdbException(
+ throw new Exception(
'Read from CDB file failed, file "' .
$this->fileName . '" may be corrupted.' );
}
@@ -129,13 +135,13 @@
/**
* Unpack an unsigned integer and throw an exception if it needs more
than 31 bits
* @param string $s
- * @throws CdbException
+ * @throws Exception
* @return mixed
*/
protected function unpack31( $s ) {
$data = unpack( 'V', $s );
if ( $data[1] > 0x7fffffff ) {
- throw new CdbException(
+ throw new Exception(
'Error in CDB file "' . $this->fileName . '",
integer too big.' );
}
@@ -159,7 +165,7 @@
*/
protected function findNext( $key ) {
if ( !$this->loop ) {
- $u = CdbFunctions::hash( $key );
+ $u = Util::hash( $key );
$buf = $this->read( 8, ( $u << 3 ) & 2047 );
$this->hslots = $this->unpack31( substr( $buf, 4 ) );
if ( !$this->hslots ) {
@@ -167,8 +173,8 @@
}
$this->hpos = $this->unpack31( substr( $buf, 0, 4 ) );
$this->khash = $u;
- $u = CdbFunctions::unsignedShiftRight( $u, 8 );
- $u = CdbFunctions::unsignedMod( $u, $this->hslots );
+ $u = Util::unsignedShiftRight( $u, 8 );
+ $u = Util::unsignedMod( $u, $this->hslots );
$u <<= 3;
$this->kpos = $this->hpos + $u;
}
diff --git a/multiversion/cdb/CdbFunctions.php
b/multiversion/vendor/cdb/cdb/src/Util.php
similarity index 98%
rename from multiversion/cdb/CdbFunctions.php
rename to multiversion/vendor/cdb/cdb/src/Util.php
index e74924c..fe19509 100644
--- a/multiversion/cdb/CdbFunctions.php
+++ b/multiversion/vendor/cdb/cdb/src/Util.php
@@ -1,4 +1,7 @@
<?php
+
+namespace Cdb;
+
/**
* This is a port of D.J. Bernstein's CDB to PHP. It's based on the copy that
* appears in PHP 5.3. Changes are:
@@ -27,7 +30,7 @@
/**
* Common functions for readers and writers
*/
-class CdbFunctions {
+class Util {
/**
* Take a modulo of a signed integer as if it were an unsigned integer.
* $b must be less than 0x40000000 and greater than 0
diff --git a/multiversion/cdb/CdbWriter.php
b/multiversion/vendor/cdb/cdb/src/Writer.php
similarity index 92%
rename from multiversion/cdb/CdbWriter.php
rename to multiversion/vendor/cdb/cdb/src/Writer.php
index b0a90c3..b994ec6 100644
--- a/multiversion/cdb/CdbWriter.php
+++ b/multiversion/vendor/cdb/cdb/src/Writer.php
@@ -1,4 +1,7 @@
<?php
+
+namespace Cdb;
+
/**
* Native CDB file reader and writer.
*
@@ -25,7 +28,7 @@
* Native and pure PHP implementations are provided.
* http://cr.yp.to/cdb.html
*/
-abstract class CdbWriter {
+abstract class Writer {
/**
* The file handle
*/
@@ -49,12 +52,12 @@
*
* @param string $fileName
*
- * @return CdbWriterDBA|CdbWriterPHP
+ * @return Writer
*/
public static function open( $fileName ) {
- return CdbReader::haveExtension() ?
- new CdbWriterDBA( $fileName ) :
- new CdbWriterPHP( $fileName );
+ return Reader::haveExtension() ?
+ new Writer\DBA( $fileName ) :
+ new Writer\PHP( $fileName );
}
/**
diff --git a/multiversion/cdb/CdbWriterDBA.php
b/multiversion/vendor/cdb/cdb/src/Writer/DBA.php
similarity index 82%
rename from multiversion/cdb/CdbWriterDBA.php
rename to multiversion/vendor/cdb/cdb/src/Writer/DBA.php
index 1de371d..eb525f4 100644
--- a/multiversion/cdb/CdbWriterDBA.php
+++ b/multiversion/vendor/cdb/cdb/src/Writer/DBA.php
@@ -1,4 +1,9 @@
<?php
+
+namespace Cdb\Writer;
+use Cdb\Exception;
+use Cdb\Writer;
+
/**
* DBA-based CDB reader/writer
*
@@ -23,13 +28,16 @@
/**
* Writer class which uses the DBA extension
*/
-class CdbWriterDBA extends CdbWriter {
+class DBA extends Writer {
+ /**
+ * @throws Exception
+ */
public function __construct( $fileName ) {
$this->realFileName = $fileName;
$this->tmpFileName = $fileName . '.tmp.' . mt_rand( 0,
0x7fffffff );
$this->handle = dba_open( $this->tmpFileName, 'n', 'cdb_make' );
if ( !$this->handle ) {
- throw new CdbException( 'Unable to open CDB file for
write "' . $fileName . '"' );
+ throw new Exception( 'Unable to open CDB file for write
"' . $fileName . '"' );
}
}
@@ -37,6 +45,9 @@
return dba_insert( $key, $value, $this->handle );
}
+ /**
+ * @throws Exception
+ */
public function close() {
if ( isset( $this->handle ) ) {
dba_close( $this->handle );
@@ -45,7 +56,7 @@
unlink( $this->realFileName );
}
if ( !rename( $this->tmpFileName, $this->realFileName ) ) {
- throw new CdbException( 'Unable to move the new CDB
file into place.' );
+ throw new Exception( 'Unable to move the new CDB file
into place.' );
}
unset( $this->handle );
}
diff --git a/multiversion/cdb/CdbWriterPHP.php
b/multiversion/vendor/cdb/cdb/src/Writer/PHP.php
similarity index 91%
rename from multiversion/cdb/CdbWriterPHP.php
rename to multiversion/vendor/cdb/cdb/src/Writer/PHP.php
index bfc0d87..68c6b76 100644
--- a/multiversion/cdb/CdbWriterPHP.php
+++ b/multiversion/vendor/cdb/cdb/src/Writer/PHP.php
@@ -1,4 +1,10 @@
<?php
+
+namespace Cdb\Writer;
+use Cdb\Exception;
+use Cdb\Util;
+use Cdb\Writer;
+
/**
* This is a port of D.J. Bernstein's CDB to PHP. It's based on the copy that
* appears in PHP 5.3. Changes are:
@@ -27,7 +33,7 @@
/**
* CDB writer class
*/
-class CdbWriterPHP extends CdbWriter {
+class PHP extends Writer {
protected $hplist;
protected $numentries;
@@ -65,11 +71,11 @@
$this->addbegin( strlen( $key ), strlen( $value ) );
$this->write( $key );
$this->write( $value );
- $this->addend( strlen( $key ), strlen( $value ),
CdbFunctions::hash( $key ) );
+ $this->addend( strlen( $key ), strlen( $value ), Util::hash(
$key ) );
}
/**
- * @throws CdbException
+ * @throws Exception
*/
public function close() {
$this->finish();
@@ -86,7 +92,7 @@
}
/**
- * @throws CdbException
+ * @throws Exception
* @param string $buf
*/
protected function write( $buf ) {
@@ -97,7 +103,7 @@
}
/**
- * @throws CdbException
+ * @throws Exception
* @param int $len
*/
protected function posplus( $len ) {
@@ -127,7 +133,7 @@
}
/**
- * @throws CdbException
+ * @throws Exception
* @param int $keylen
* @param int $datalen
*/
@@ -143,7 +149,7 @@
}
/**
- * @throws CdbException
+ * @throws Exception
*/
protected function finish() {
// Hack for DBA cross-check
@@ -189,8 +195,8 @@
// is taken.
for ( $u = 0; $u < $count; ++$u ) {
$hp = $packedTables[$starts[$i] + $u];
- $where = CdbFunctions::unsignedMod(
- CdbFunctions::unsignedShiftRight(
$hp['h'], 8 ), $len );
+ $where = Util::unsignedMod(
+ Util::unsignedShiftRight( $hp['h'], 8
), $len );
while ( $hashtable[$where]['p'] ) {
if ( ++$where == $len ) {
$where = 0;
@@ -203,7 +209,7 @@
for ( $u = 0; $u < $len; ++$u ) {
$buf = pack( 'vvV',
$hashtable[$u]['h'] & 0xffff,
- CdbFunctions::unsignedShiftRight(
$hashtable[$u]['h'], 16 ),
+ Util::unsignedShiftRight(
$hashtable[$u]['h'], 16 ),
$hashtable[$u]['p'] );
$this->write( $buf );
$this->posplus( 8 );
@@ -222,13 +228,13 @@
* Clean up the temp file and throw an exception
*
* @param string $msg
- * @throws CdbException
+ * @throws Exception
*/
protected function throwException( $msg ) {
if ( $this->handle ) {
fclose( $this->handle );
unlink( $this->tmpFileName );
}
- throw new CdbException( $msg );
+ throw new Exception( $msg );
}
}
diff --git a/multiversion/vendor/cdb/cdb/test/CdbTest.php
b/multiversion/vendor/cdb/cdb/test/CdbTest.php
new file mode 100644
index 0000000..920fc11
--- /dev/null
+++ b/multiversion/vendor/cdb/cdb/test/CdbTest.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace Cdb\Test;
+use Cdb\Reader;
+use Cdb\Writer;
+
+/**
+ * Test the CDB reader/writer
+ * @covers Cdb\Writer\PHP
+ * @covers Cdb\Writer\DBA
+ */
+class CdbTest extends \PHPUnit_Framework_TestCase {
+ /** @var string */
+ private $phpCdbFile, $dbaCdbFile;
+
+ protected function setUp() {
+ parent::setUp();
+ if ( !Reader::haveExtension() ) {
+ $this->markTestSkipped( 'Native CDB support is not
available.' );
+ }
+ $temp = sys_get_temp_dir();
+ if ( !is_writable( $temp ) ) {
+ $this->markTestSkipped( "Temp dir [$temp] isn't
writable." );
+ }
+ $this->phpCdbFile = tempnam( $temp, get_class( $this ) . '_' );
+ $this->dbaCdbFile = tempnam( $temp, get_class( $this ) . '_' );
+ }
+
+ /**
+ * Make a random-ish string
+ * @return string
+ */
+ private static function randomString() {
+ $len = mt_rand( 0, 10 );
+ $s = '';
+ for ( $j = 0; $j < $len; $j++ ) {
+ $s .= chr( mt_rand( 0, 255 ) );
+ }
+
+ return $s;
+ }
+
+ public function testCdbWrite() {
+ $w1 = new Writer\PHP( $this->phpCdbFile );
+ $w2 = new Writer\DBA( $this->dbaCdbFile );
+
+ $data = array();
+ for ( $i = 0; $i < 1000; $i++ ) {
+ $key = self::randomString();
+ $value = self::randomString();
+ $w1->set( $key, $value );
+ $w2->set( $key, $value );
+
+ if ( !isset( $data[$key] ) ) {
+ $data[$key] = $value;
+ }
+ }
+
+ $w1->close();
+ $w2->close();
+
+ $this->assertEquals(
+ md5_file( $this->phpCdbFile ),
+ md5_file( $this->dbaCdbFile ),
+ 'same hash'
+ );
+
+ $r1 = new Reader\PHP( $this->phpCdbFile );
+ $r2 = new Reader\DBA( $this->dbaCdbFile );
+
+ foreach ( $data as $key => $value ) {
+ if ( $key === '' ) {
+ // Known bug
+ continue;
+ }
+ $v1 = $r1->get( $key );
+ $v2 = $r2->get( $key );
+
+ $v1 = $v1 === false ? '(not found)' : $v1;
+ $v2 = $v2 === false ? '(not found)' : $v2;
+
+ # cdbAssert( 'Mismatch', $key, $v1, $v2 );
+ $this->cdbAssert( "PHP error", $key, $v1, $value );
+ $this->cdbAssert( "DBA error", $key, $v2, $value );
+ }
+ }
+
+ private function cdbAssert( $msg, $key, $v1, $v2 ) {
+ $this->assertEquals(
+ $v2,
+ $v1,
+ $msg . ', k=' . bin2hex( $key )
+ );
+ }
+}
diff --git a/multiversion/vendor/composer/ClassLoader.php
b/multiversion/vendor/composer/ClassLoader.php
new file mode 100644
index 0000000..4a56396
--- /dev/null
+++ b/multiversion/vendor/composer/ClassLoader.php
@@ -0,0 +1,386 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <nader...@naderman.de>
+ * Jordi Boggiano <j.boggi...@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer\Autoload;
+
+/**
+ * ClassLoader implements a PSR-0 class loader
+ *
+ * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
+ *
+ * $loader = new \Composer\Autoload\ClassLoader();
+ *
+ * // register classes with namespaces
+ * $loader->add('Symfony\Component', __DIR__.'/component');
+ * $loader->add('Symfony', __DIR__.'/framework');
+ *
+ * // activate the autoloader
+ * $loader->register();
+ *
+ * // to enable searching the include path (eg. for PEAR packages)
+ * $loader->setUseIncludePath(true);
+ *
+ * In this example, if you try to use a class in the Symfony\Component
+ * namespace or one of its children (Symfony\Component\Console for instance),
+ * the autoloader will first look for the class under the component/
+ * directory, and it will then fallback to the framework/ directory if not
+ * found before giving up.
+ *
+ * This class is loosely based on the Symfony UniversalClassLoader.
+ *
+ * @author Fabien Potencier <fab...@symfony.com>
+ * @author Jordi Boggiano <j.boggi...@seld.be>
+ */
+class ClassLoader
+{
+ // PSR-4
+ private $prefixLengthsPsr4 = array();
+ private $prefixDirsPsr4 = array();
+ private $fallbackDirsPsr4 = array();
+
+ // PSR-0
+ private $prefixesPsr0 = array();
+ private $fallbackDirsPsr0 = array();
+
+ private $useIncludePath = false;
+ private $classMap = array();
+
+ public function getPrefixes()
+ {
+ if (!empty($this->prefixesPsr0)) {
+ return call_user_func_array('array_merge', $this->prefixesPsr0);
+ }
+ return array();
+ }
+
+ public function getPrefixesPsr4()
+ {
+ return $this->prefixDirsPsr4;
+ }
+
+ public function getFallbackDirs()
+ {
+ return $this->fallbackDirsPsr0;
+ }
+
+ public function getFallbackDirsPsr4()
+ {
+ return $this->fallbackDirsPsr4;
+ }
+
+ public function getClassMap()
+ {
+ return $this->classMap;
+ }
+
+ /**
+ * @param array $classMap Class to filename map
+ */
+ public function addClassMap(array $classMap)
+ {
+ if ($this->classMap) {
+ $this->classMap = array_merge($this->classMap, $classMap);
+ } else {
+ $this->classMap = $classMap;
+ }
+ }
+
+ /**
+ * Registers a set of PSR-0 directories for a given prefix, either
+ * appending or prepending to the ones previously set for this prefix.
+ *
+ * @param string $prefix The prefix
+ * @param array|string $paths The PSR-0 root directories
+ * @param bool $prepend Whether to prepend the directories
+ */
+ public function add($prefix, $paths, $prepend = false)
+ {
+ if (!$prefix) {
+ if ($prepend) {
+ $this->fallbackDirsPsr0 = array_merge(
+ (array) $paths,
+ $this->fallbackDirsPsr0
+ );
+ } else {
+ $this->fallbackDirsPsr0 = array_merge(
+ $this->fallbackDirsPsr0,
+ (array) $paths
+ );
+ }
+
+ return;
+ }
+
+ $first = $prefix[0];
+ if (!isset($this->prefixesPsr0[$first][$prefix])) {
+ $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+
+ return;
+ }
+ if ($prepend) {
+ $this->prefixesPsr0[$first][$prefix] = array_merge(
+ (array) $paths,
+ $this->prefixesPsr0[$first][$prefix]
+ );
+ } else {
+ $this->prefixesPsr0[$first][$prefix] = array_merge(
+ $this->prefixesPsr0[$first][$prefix],
+ (array) $paths
+ );
+ }
+ }
+
+ /**
+ * Registers a set of PSR-4 directories for a given namespace, either
+ * appending or prepending to the ones previously set for this namespace.
+ *
+ * @param string $prefix The prefix/namespace, with trailing '\\'
+ * @param array|string $paths The PSR-0 base directories
+ * @param bool $prepend Whether to prepend the directories
+ *
+ * @throws \InvalidArgumentException
+ */
+ public function addPsr4($prefix, $paths, $prepend = false)
+ {
+ if (!$prefix) {
+ // Register directories for the root namespace.
+ if ($prepend) {
+ $this->fallbackDirsPsr4 = array_merge(
+ (array) $paths,
+ $this->fallbackDirsPsr4
+ );
+ } else {
+ $this->fallbackDirsPsr4 = array_merge(
+ $this->fallbackDirsPsr4,
+ (array) $paths
+ );
+ }
+ } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+ // Register directories for a new namespace.
+ $length = strlen($prefix);
+ if ('\\' !== $prefix[$length - 1]) {
+ throw new \InvalidArgumentException("A non-empty PSR-4 prefix
must end with a namespace separator.");
+ }
+ $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+ $this->prefixDirsPsr4[$prefix] = (array) $paths;
+ } elseif ($prepend) {
+ // Prepend directories for an already registered namespace.
+ $this->prefixDirsPsr4[$prefix] = array_merge(
+ (array) $paths,
+ $this->prefixDirsPsr4[$prefix]
+ );
+ } else {
+ // Append directories for an already registered namespace.
+ $this->prefixDirsPsr4[$prefix] = array_merge(
+ $this->prefixDirsPsr4[$prefix],
+ (array) $paths
+ );
+ }
+ }
+
+ /**
+ * Registers a set of PSR-0 directories for a given prefix,
+ * replacing any others previously set for this prefix.
+ *
+ * @param string $prefix The prefix
+ * @param array|string $paths The PSR-0 base directories
+ */
+ public function set($prefix, $paths)
+ {
+ if (!$prefix) {
+ $this->fallbackDirsPsr0 = (array) $paths;
+ } else {
+ $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+ }
+ }
+
+ /**
+ * Registers a set of PSR-4 directories for a given namespace,
+ * replacing any others previously set for this namespace.
+ *
+ * @param string $prefix The prefix/namespace, with trailing '\\'
+ * @param array|string $paths The PSR-4 base directories
+ *
+ * @throws \InvalidArgumentException
+ */
+ public function setPsr4($prefix, $paths)
+ {
+ if (!$prefix) {
+ $this->fallbackDirsPsr4 = (array) $paths;
+ } else {
+ $length = strlen($prefix);
+ if ('\\' !== $prefix[$length - 1]) {
+ throw new \InvalidArgumentException("A non-empty PSR-4 prefix
must end with a namespace separator.");
+ }
+ $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+ $this->prefixDirsPsr4[$prefix] = (array) $paths;
+ }
+ }
+
+ /**
+ * Turns on searching the include path for class files.
+ *
+ * @param bool $useIncludePath
+ */
+ public function setUseIncludePath($useIncludePath)
+ {
+ $this->useIncludePath = $useIncludePath;
+ }
+
+ /**
+ * Can be used to check if the autoloader uses the include path to check
+ * for classes.
+ *
+ * @return bool
+ */
+ public function getUseIncludePath()
+ {
+ return $this->useIncludePath;
+ }
+
+ /**
+ * Registers this instance as an autoloader.
+ *
+ * @param bool $prepend Whether to prepend the autoloader or not
+ */
+ public function register($prepend = false)
+ {
+ spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+ }
+
+ /**
+ * Unregisters this instance as an autoloader.
+ */
+ public function unregister()
+ {
+ spl_autoload_unregister(array($this, 'loadClass'));
+ }
+
+ /**
+ * Loads the given class or interface.
+ *
+ * @param string $class The name of the class
+ * @return bool|null True if loaded, null otherwise
+ */
+ public function loadClass($class)
+ {
+ if ($file = $this->findFile($class)) {
+ includeFile($file);
+
+ return true;
+ }
+ }
+
+ /**
+ * Finds the path to the file where the class is defined.
+ *
+ * @param string $class The name of the class
+ *
+ * @return string|false The path if found, false otherwise
+ */
+ public function findFile($class)
+ {
+ // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
+ if ('\\' == $class[0]) {
+ $class = substr($class, 1);
+ }
+
+ // class map lookup
+ if (isset($this->classMap[$class])) {
+ return $this->classMap[$class];
+ }
+
+ $file = $this->findFileWithExtension($class, '.php');
+
+ // Search for Hack files if we are running on HHVM
+ if ($file === null && defined('HHVM_VERSION')) {
+ $file = $this->findFileWithExtension($class, '.hh');
+ }
+
+ if ($file === null) {
+ // Remember that this class does not exist.
+ return $this->classMap[$class] = false;
+ }
+
+ return $file;
+ }
+
+ private function findFileWithExtension($class, $ext)
+ {
+ // PSR-4 lookup
+ $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+
+ $first = $class[0];
+ if (isset($this->prefixLengthsPsr4[$first])) {
+ foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
+ if (0 === strpos($class, $prefix)) {
+ foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
+ if (file_exists($file = $dir . DIRECTORY_SEPARATOR .
substr($logicalPathPsr4, $length))) {
+ return $file;
+ }
+ }
+ }
+ }
+ }
+
+ // PSR-4 fallback dirs
+ foreach ($this->fallbackDirsPsr4 as $dir) {
+ if (file_exists($file = $dir . DIRECTORY_SEPARATOR .
$logicalPathPsr4)) {
+ return $file;
+ }
+ }
+
+ // PSR-0 lookup
+ if (false !== $pos = strrpos($class, '\\')) {
+ // namespaced class name
+ $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
+ . strtr(substr($logicalPathPsr4, $pos + 1), '_',
DIRECTORY_SEPARATOR);
+ } else {
+ // PEAR-like class name
+ $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+ }
+
+ if (isset($this->prefixesPsr0[$first])) {
+ foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
+ if (0 === strpos($class, $prefix)) {
+ foreach ($dirs as $dir) {
+ if (file_exists($file = $dir . DIRECTORY_SEPARATOR .
$logicalPathPsr0)) {
+ return $file;
+ }
+ }
+ }
+ }
+ }
+
+ // PSR-0 fallback dirs
+ foreach ($this->fallbackDirsPsr0 as $dir) {
+ if (file_exists($file = $dir . DIRECTORY_SEPARATOR .
$logicalPathPsr0)) {
+ return $file;
+ }
+ }
+
+ // PSR-0 include paths.
+ if ($this->useIncludePath && $file =
stream_resolve_include_path($logicalPathPsr0)) {
+ return $file;
+ }
+ }
+}
+
+/**
+ * Scope isolated include.
+ *
+ * Prevents access to $this/self from included files.
+ */
+function includeFile($file)
+{
+ include $file;
+}
diff --git a/multiversion/vendor/composer/autoload_classmap.php
b/multiversion/vendor/composer/autoload_classmap.php
new file mode 100644
index 0000000..10dceb9
--- /dev/null
+++ b/multiversion/vendor/composer/autoload_classmap.php
@@ -0,0 +1,17 @@
+<?php
+
+// autoload_classmap.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+ 'Cdb\\Exception' => $vendorDir . '/cdb/cdb/src/Exception.php',
+ 'Cdb\\Reader' => $vendorDir . '/cdb/cdb/src/Reader.php',
+ 'Cdb\\Reader\\DBA' => $vendorDir . '/cdb/cdb/src/Reader/DBA.php',
+ 'Cdb\\Reader\\PHP' => $vendorDir . '/cdb/cdb/src/Reader/PHP.php',
+ 'Cdb\\Util' => $vendorDir . '/cdb/cdb/src/Util.php',
+ 'Cdb\\Writer' => $vendorDir . '/cdb/cdb/src/Writer.php',
+ 'Cdb\\Writer\\DBA' => $vendorDir . '/cdb/cdb/src/Writer/DBA.php',
+ 'Cdb\\Writer\\PHP' => $vendorDir . '/cdb/cdb/src/Writer/PHP.php',
+);
diff --git a/multiversion/vendor/composer/autoload_namespaces.php
b/multiversion/vendor/composer/autoload_namespaces.php
new file mode 100644
index 0000000..b7fc012
--- /dev/null
+++ b/multiversion/vendor/composer/autoload_namespaces.php
@@ -0,0 +1,9 @@
+<?php
+
+// autoload_namespaces.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+);
diff --git a/multiversion/vendor/composer/autoload_psr4.php
b/multiversion/vendor/composer/autoload_psr4.php
new file mode 100644
index 0000000..b265c64
--- /dev/null
+++ b/multiversion/vendor/composer/autoload_psr4.php
@@ -0,0 +1,9 @@
+<?php
+
+// autoload_psr4.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+);
diff --git a/multiversion/vendor/composer/autoload_real.php
b/multiversion/vendor/composer/autoload_real.php
new file mode 100644
index 0000000..c69a60c
--- /dev/null
+++ b/multiversion/vendor/composer/autoload_real.php
@@ -0,0 +1,50 @@
+<?php
+
+// autoload_real.php @generated by Composer
+
+class ComposerAutoloaderInit69905fe98d44fa6f371f0023e4aa4797
+{
+ private static $loader;
+
+ public static function loadClassLoader($class)
+ {
+ if ('Composer\Autoload\ClassLoader' === $class) {
+ require __DIR__ . '/ClassLoader.php';
+ }
+ }
+
+ public static function getLoader()
+ {
+ if (null !== self::$loader) {
+ return self::$loader;
+ }
+
+
spl_autoload_register(array('ComposerAutoloaderInit69905fe98d44fa6f371f0023e4aa4797',
'loadClassLoader'), true, true);
+ self::$loader = $loader = new \Composer\Autoload\ClassLoader();
+
spl_autoload_unregister(array('ComposerAutoloaderInit69905fe98d44fa6f371f0023e4aa4797',
'loadClassLoader'));
+
+ $map = require __DIR__ . '/autoload_namespaces.php';
+ foreach ($map as $namespace => $path) {
+ $loader->set($namespace, $path);
+ }
+
+ $map = require __DIR__ . '/autoload_psr4.php';
+ foreach ($map as $namespace => $path) {
+ $loader->setPsr4($namespace, $path);
+ }
+
+ $classMap = require __DIR__ . '/autoload_classmap.php';
+ if ($classMap) {
+ $loader->addClassMap($classMap);
+ }
+
+ $loader->register(true);
+
+ return $loader;
+ }
+}
+
+function composerRequire69905fe98d44fa6f371f0023e4aa4797($file)
+{
+ require $file;
+}
diff --git a/multiversion/vendor/composer/installed.json
b/multiversion/vendor/composer/installed.json
new file mode 100644
index 0000000..a5e8577
--- /dev/null
+++ b/multiversion/vendor/composer/installed.json
@@ -0,0 +1,48 @@
+[
+ {
+ "name": "cdb/cdb",
+ "version": "1.0.0",
+ "version_normalized": "1.0.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": "*"
+ },
+ "time": "2014-11-12 19:03:26",
+ "type": "library",
+ "installation-source": "dist",
+ "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": "https://www.mediawiki.org/wiki/CDB";
+ }
+]
diff --git a/wmf-config/missing.php b/wmf-config/missing.php
index 23ad0ff..5f4d21c 100644
--- a/wmf-config/missing.php
+++ b/wmf-config/missing.php
@@ -21,7 +21,10 @@
// define( 'MISSING_PHP_TEST', 1 );
-require dirname( __DIR__ ) . '/multiversion/Cdb.php';
+require_once dirname( __DIR__ ) . '/multiversion/vendor/autoload.php';
+
+use Cdb\Exception as CdbException;
+use Cdb\Reader as CdbReader;
/**
* The main function
--
To view, visit https://gerrit.wikimedia.org/r/175796
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2674f5c6aaaf853a415948b4a46c3ad512f8c260
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
