Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/178336
Change subject: cdb/cdb was renamed to wikimedia/cdb ...................................................................... cdb/cdb was renamed to wikimedia/cdb Version number was also bumped to 1.0.1 Change-Id: I55442376c9e959d97a39204bd62406b5d7171132 --- D cdb/cdb/README.md M composer.json M composer.lock M composer/autoload_classmap.php M composer/installed.json R wikimedia/cdb/.gitignore R wikimedia/cdb/.gitreview R wikimedia/cdb/COPYING A wikimedia/cdb/Doxyfile A wikimedia/cdb/README.md R wikimedia/cdb/composer.json A wikimedia/cdb/doc/README R wikimedia/cdb/src/Exception.php R wikimedia/cdb/src/Reader.php R wikimedia/cdb/src/Reader/DBA.php R wikimedia/cdb/src/Reader/PHP.php R wikimedia/cdb/src/Util.php R wikimedia/cdb/src/Writer.php R wikimedia/cdb/src/Writer/DBA.php R wikimedia/cdb/src/Writer/PHP.php R wikimedia/cdb/test/CdbTest.php 21 files changed, 185 insertions(+), 112 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor refs/changes/36/178336/1 diff --git a/cdb/cdb/README.md b/cdb/cdb/README.md deleted file mode 100644 index 1138265..0000000 --- a/cdb/cdb/README.md +++ /dev/null @@ -1,9 +0,0 @@ -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/composer.json b/composer.json index 33b6a4b..9212191 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,6 @@ } ], "require": { - "cdb/cdb": "1.0.0", "cssjanus/cssjanus": "1.1.1", "leafo/lessphp": "0.5.0", "php": ">=5.3.3", @@ -18,7 +17,8 @@ "monolog/monolog": "1.11.0", "Plancake/EmailParser": "dev-master#e7453ead1f3a74810d8050a30afb96feed74477a", "ruflin/elastica": "1.3.0.0", - "oojs/oojs-ui": "0.2.4" + "oojs/oojs-ui": "0.2.4", + "wikimedia/cdb": "1.0.1" }, "prefer-stable": true, "config": { diff --git a/composer.lock b/composer.lock index c65484d..304be1f 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": "48d16b008b04d5e23e09883774debd07", + "hash": "091eedf837181abb61b3008ac6cfffb2", "packages": [ { "name": "Plancake/EmailParser", @@ -49,50 +49,6 @@ "issues": "https://github.com/plancake/official-library-php-email-parser/issues"; }, "time": "2013-09-05 21:02:55" - }, - { - "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": "[email protected]" - }, - { - "name": "Chad Horohoe", - "email": "[email protected]" - } - ], - "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" }, { "name": "cssjanus/cssjanus", @@ -368,6 +324,50 @@ "search" ], "time": "2014-07-27 13:45:09" + }, + { + "name": "wikimedia/cdb", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/wikimedia/cdb.git";, + "reference": "3b7d5366c88eccf2517ebac57c59eb557c82f46c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/wikimedia/cdb/zipball/3b7d5366c88eccf2517ebac57c59eb557c82f46c";, + "reference": "3b7d5366c88eccf2517ebac57c59eb557c82f46c", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "require-dev": { + "phpunit/phpunit": "*" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/";, + "license": [ + "GPL-2.0" + ], + "authors": [ + { + "name": "Tim Starling", + "email": "[email protected]" + }, + { + "name": "Chad Horohoe", + "email": "[email protected]" + } + ], + "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-12-08 19:26:44" } ], "packages-dev": [], diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php index 40538e6..494f432 100644 --- a/composer/autoload_classmap.php +++ b/composer/autoload_classmap.php @@ -8,14 +8,14 @@ return array( 'CSSJanus' => $vendorDir . '/cssjanus/cssjanus/src/CSSJanus.php', 'CSSJanusTokenizer' => $vendorDir . '/cssjanus/cssjanus/src/CSSJanus.php', - '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', + 'Cdb\\Exception' => $vendorDir . '/wikimedia/cdb/src/Exception.php', + 'Cdb\\Reader' => $vendorDir . '/wikimedia/cdb/src/Reader.php', + 'Cdb\\Reader\\DBA' => $vendorDir . '/wikimedia/cdb/src/Reader/DBA.php', + 'Cdb\\Reader\\PHP' => $vendorDir . '/wikimedia/cdb/src/Reader/PHP.php', + 'Cdb\\Util' => $vendorDir . '/wikimedia/cdb/src/Util.php', + 'Cdb\\Writer' => $vendorDir . '/wikimedia/cdb/src/Writer.php', + 'Cdb\\Writer\\DBA' => $vendorDir . '/wikimedia/cdb/src/Writer/DBA.php', + 'Cdb\\Writer\\PHP' => $vendorDir . '/wikimedia/cdb/src/Writer/PHP.php', 'Elastica\\AbstractUpdateAction' => $vendorDir . '/ruflin/elastica/lib/Elastica/AbstractUpdateAction.php', 'Elastica\\Aggregation\\AbstractAggregation' => $vendorDir . '/ruflin/elastica/lib/Elastica/Aggregation/AbstractAggregation.php', 'Elastica\\Aggregation\\AbstractSimpleAggregation' => $vendorDir . '/ruflin/elastica/lib/Elastica/Aggregation/AbstractSimpleAggregation.php', diff --git a/composer/installed.json b/composer/installed.json index 93f23e9..f29188a 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -160,52 +160,6 @@ ] }, { - "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": "[email protected]" - }, - { - "name": "Chad Horohoe", - "email": "[email protected]" - } - ], - "description": "Constant Database (CDB) wrapper library for PHP. Provides pure-PHP fallback when dba_* functions are absent.", - "homepage": "https://www.mediawiki.org/wiki/CDB"; - }, - { "name": "ruflin/elastica", "version": "v1.3.0.0", "version_normalized": "1.3.0.0", @@ -377,5 +331,51 @@ "MIT" ], "homepage": "https://www.mediawiki.org/wiki/OOjs_UI"; + }, + { + "name": "wikimedia/cdb", + "version": "1.0.1", + "version_normalized": "1.0.1.0", + "source": { + "type": "git", + "url": "https://github.com/wikimedia/cdb.git";, + "reference": "3b7d5366c88eccf2517ebac57c59eb557c82f46c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/wikimedia/cdb/zipball/3b7d5366c88eccf2517ebac57c59eb557c82f46c";, + "reference": "3b7d5366c88eccf2517ebac57c59eb557c82f46c", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "require-dev": { + "phpunit/phpunit": "*" + }, + "time": "2014-12-08 19:26:44", + "type": "library", + "installation-source": "dist", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/";, + "license": [ + "GPL-2.0" + ], + "authors": [ + { + "name": "Tim Starling", + "email": "[email protected]" + }, + { + "name": "Chad Horohoe", + "email": "[email protected]" + } + ], + "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/cdb/cdb/.gitignore b/wikimedia/cdb/.gitignore similarity index 68% rename from cdb/cdb/.gitignore rename to wikimedia/cdb/.gitignore index d1502b0..1dd7ea5 100644 --- a/cdb/cdb/.gitignore +++ b/wikimedia/cdb/.gitignore @@ -1,2 +1,3 @@ +/doc/html vendor/ composer.lock diff --git a/cdb/cdb/.gitreview b/wikimedia/cdb/.gitreview similarity index 100% rename from cdb/cdb/.gitreview rename to wikimedia/cdb/.gitreview diff --git a/cdb/cdb/COPYING b/wikimedia/cdb/COPYING similarity index 100% rename from cdb/cdb/COPYING rename to wikimedia/cdb/COPYING diff --git a/wikimedia/cdb/Doxyfile b/wikimedia/cdb/Doxyfile new file mode 100644 index 0000000..e77e75a --- /dev/null +++ b/wikimedia/cdb/Doxyfile @@ -0,0 +1,32 @@ +# Configuration file for Doxygen + +PROJECT_NAME = CDB +PROJECT_BRIEF = CDB functions for PHP + +OUTPUT_DIRECTORY = doc + +JAVADOC_AUTOBRIEF = YES +QT_AUTOBRIEF = YES + +WARN_NO_PARAMDOC = YES + +INPUT = README.md src/ +FILE_PATTERNS = *.php +RECURSIVE = YES +# Requires doxygen 1.8.3+ +USE_MDFILE_AS_MAINPAGE = README.md + +HTML_DYNAMIC_SECTIONS = YES +GENERATE_TREEVIEW = YES +TREEVIEW_WIDTH = 250 + +GENERATE_LATEX = NO + +HAVE_DOT = YES +DOT_FONTNAME = Helvetica +DOT_FONTSIZE = 10 +TEMPLATE_RELATIONS = YES +CALL_GRAPH = NO +CALLER_GRAPH = NO +# Makes dot run faster. Requires graphviz >1.8.10 +DOT_MULTI_TARGETS = YES diff --git a/wikimedia/cdb/README.md b/wikimedia/cdb/README.md new file mode 100644 index 0000000..e4ef449 --- /dev/null +++ b/wikimedia/cdb/README.md @@ -0,0 +1,48 @@ +[](https://packagist.org/packages/cdb/cdb) [](https://packagist.org/packages/cdb/cdb) + +CDB functions for PHP +===================== + +[CDB][], short for "constant database", refers to a very fast and highly +reliable database system which uses a simple file with key value pairs. This +library wraps the 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. + +Additional documentation about the library can be found on [MediaWiki.org](https://www.mediawiki.org/wiki/CDB). + + +Usage +----- + +``` +// Reading a CDB file +$cdb = \Cdb\Reader::open( 'db.cdb' ); +$foo = $cdb->get( 'somekey' ); + +// Writing to a CDB file +$cdb = \Cdb\Writer::open( 'anotherdb.cdb' ); +$cdb->set( 'somekey', $foo ); +``` + +Running tests +------------- + +``` +composer install --prefer-dist +cd test +../vendor/phpunit/phpunit/phpunit . +``` + +History +------- + +This library was first introduced in [MediaWiki 1.16][] ([r52203][]). It was +split out of the MediaWiki codebase and published as an independent library +during the [MediaWiki 1.25][] development cycle. + +--- +[CDB]: https://en.wikipedia.org/wiki/cdb_(software) +[MediaWiki 1.16]: https://www.mediawiki.org/wiki/MediaWiki_1.16 +[r52203]: https://www.mediawiki.org/wiki/Special:Code/MediaWiki/52203 +[MediaWiki 1.25]: https://www.mediawiki.org/wiki/MediaWiki_1.25 diff --git a/cdb/cdb/composer.json b/wikimedia/cdb/composer.json similarity index 91% rename from cdb/cdb/composer.json rename to wikimedia/cdb/composer.json index fed2a4f..2134d2f 100644 --- a/cdb/cdb/composer.json +++ b/wikimedia/cdb/composer.json @@ -1,7 +1,7 @@ { - "name": "cdb/cdb", + "name": "wikimedia/cdb", "description": "Constant Database (CDB) wrapper library for PHP. Provides pure-PHP fallback when dba_* functions are absent.", - "license": "GPLv2", + "license": "GPL-2.0", "homepage": "https://www.mediawiki.org/wiki/CDB";, "authors": [ { diff --git a/wikimedia/cdb/doc/README b/wikimedia/cdb/doc/README new file mode 100644 index 0000000..15ee3b7 --- /dev/null +++ b/wikimedia/cdb/doc/README @@ -0,0 +1 @@ +Placeholder for doxygen documentation diff --git a/cdb/cdb/src/Exception.php b/wikimedia/cdb/src/Exception.php similarity index 100% rename from cdb/cdb/src/Exception.php rename to wikimedia/cdb/src/Exception.php diff --git a/cdb/cdb/src/Reader.php b/wikimedia/cdb/src/Reader.php similarity index 100% rename from cdb/cdb/src/Reader.php rename to wikimedia/cdb/src/Reader.php diff --git a/cdb/cdb/src/Reader/DBA.php b/wikimedia/cdb/src/Reader/DBA.php similarity index 100% rename from cdb/cdb/src/Reader/DBA.php rename to wikimedia/cdb/src/Reader/DBA.php diff --git a/cdb/cdb/src/Reader/PHP.php b/wikimedia/cdb/src/Reader/PHP.php similarity index 100% rename from cdb/cdb/src/Reader/PHP.php rename to wikimedia/cdb/src/Reader/PHP.php diff --git a/cdb/cdb/src/Util.php b/wikimedia/cdb/src/Util.php similarity index 100% rename from cdb/cdb/src/Util.php rename to wikimedia/cdb/src/Util.php diff --git a/cdb/cdb/src/Writer.php b/wikimedia/cdb/src/Writer.php similarity index 100% rename from cdb/cdb/src/Writer.php rename to wikimedia/cdb/src/Writer.php diff --git a/cdb/cdb/src/Writer/DBA.php b/wikimedia/cdb/src/Writer/DBA.php similarity index 100% rename from cdb/cdb/src/Writer/DBA.php rename to wikimedia/cdb/src/Writer/DBA.php diff --git a/cdb/cdb/src/Writer/PHP.php b/wikimedia/cdb/src/Writer/PHP.php similarity index 100% rename from cdb/cdb/src/Writer/PHP.php rename to wikimedia/cdb/src/Writer/PHP.php diff --git a/cdb/cdb/test/CdbTest.php b/wikimedia/cdb/test/CdbTest.php similarity index 100% rename from cdb/cdb/test/CdbTest.php rename to wikimedia/cdb/test/CdbTest.php -- To view, visit https://gerrit.wikimedia.org/r/178336 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I55442376c9e959d97a39204bd62406b5d7171132 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vendor Gerrit-Branch: master Gerrit-Owner: Legoktm <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
