jenkins-bot has submitted this change and it was merged. Change subject: Bump wikimedia/cdb to 1.4.1 ......................................................................
Bump wikimedia/cdb to 1.4.1 Change-Id: Id8eb51b91058039c4d16b47d241382dcacd7ff41 --- M composer.json M composer.lock M composer/installed.json M wikimedia/cdb/src/Reader/Hash.php 4 files changed, 67 insertions(+), 69 deletions(-) Approvals: BryanDavis: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 7671414..d7e2349 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "wikimedia/assert": "0.2.2", "wikimedia/avro": "1.7.7", "wikimedia/base-convert": "1.0.1", - "wikimedia/cdb": "1.4.0", + "wikimedia/cdb": "1.4.1", "wikimedia/cldr-plural-rule-parser": "1.0.0", "wikimedia/composer-merge-plugin": "1.3.1", "wikimedia/html-formatter": "1.0.1", diff --git a/composer.lock b/composer.lock index eeafbf0..5aab7d2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "7253faa6e78c67e17f3e0ed6b88e2c0c", - "content-hash": "fa3b66688dd61115f4e93a380b664a6d", + "hash": "014853eafd992dc582170aaa7e326f59", + "content-hash": "b57c820fef6a8b03501865f136b2d062", "packages": [ { "name": "composer/semver", @@ -1284,21 +1284,20 @@ }, { "name": "wikimedia/cdb", - "version": "1.4.0", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/wikimedia/cdb.git", - "reference": "de73728295f8452465dbb5ec2b680427d557e61b" + "reference": "d49d96232f045311dc1f21bf0d7e40adf82a1f1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/cdb/zipball/de73728295f8452465dbb5ec2b680427d557e61b", - "reference": "de73728295f8452465dbb5ec2b680427d557e61b", + "url": "https://api.github.com/repos/wikimedia/cdb/zipball/d49d96232f045311dc1f21bf0d7e40adf82a1f1d", + "reference": "d49d96232f045311dc1f21bf0d7e40adf82a1f1d", "shasum": "" }, "require": { - "php": ">=5.3.2", - "wikimedia/assert": "~0.2.2" + "php": ">=5.3.2" }, "require-dev": { "jakub-onderka/php-parallel-lint": "0.9", @@ -1334,7 +1333,7 @@ ], "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": "2016-05-04 21:47:24" + "time": "2016-05-29 07:39:26" }, { "name": "wikimedia/cldr-plural-rule-parser", diff --git a/composer/installed.json b/composer/installed.json index 1196d94..5ab5a72 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -1745,62 +1745,6 @@ "homepage": "https://github.com/wikimedia/IPSet" }, { - "name": "wikimedia/cdb", - "version": "1.4.0", - "version_normalized": "1.4.0.0", - "source": { - "type": "git", - "url": "https://github.com/wikimedia/cdb.git", - "reference": "de73728295f8452465dbb5ec2b680427d557e61b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/wikimedia/cdb/zipball/de73728295f8452465dbb5ec2b680427d557e61b", - "reference": "de73728295f8452465dbb5ec2b680427d557e61b", - "shasum": "" - }, - "require": { - "php": ">=5.3.2", - "wikimedia/assert": "~0.2.2" - }, - "require-dev": { - "jakub-onderka/php-parallel-lint": "0.9", - "mediawiki/mediawiki-codesniffer": "0.5.0", - "phpunit/phpunit": "4.6.*" - }, - "time": "2016-05-04 21:47:24", - "type": "library", - "installation-source": "dist", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0+" - ], - "authors": [ - { - "name": "Daniel Kinzler" - }, - { - "name": "Tim Starling", - "email": "tstarl...@wikimedia.org" - }, - { - "name": "Chad Horohoe", - "email": "c...@wikimedia.org" - }, - { - "name": "Ori Livneh", - "email": "o...@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" - }, - { "name": "oojs/oojs-ui", "version": "v0.17.3", "version_normalized": "0.17.3.0", @@ -1880,5 +1824,60 @@ ], "description": "Provides library of common widgets, layouts, and windows.", "homepage": "https://www.mediawiki.org/wiki/OOjs_UI" + }, + { + "name": "wikimedia/cdb", + "version": "1.4.1", + "version_normalized": "1.4.1.0", + "source": { + "type": "git", + "url": "https://github.com/wikimedia/cdb.git", + "reference": "d49d96232f045311dc1f21bf0d7e40adf82a1f1d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/wikimedia/cdb/zipball/d49d96232f045311dc1f21bf0d7e40adf82a1f1d", + "reference": "d49d96232f045311dc1f21bf0d7e40adf82a1f1d", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9", + "mediawiki/mediawiki-codesniffer": "0.5.0", + "phpunit/phpunit": "4.6.*" + }, + "time": "2016-05-29 07:39:26", + "type": "library", + "installation-source": "dist", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Daniel Kinzler" + }, + { + "name": "Tim Starling", + "email": "tstarl...@wikimedia.org" + }, + { + "name": "Chad Horohoe", + "email": "c...@wikimedia.org" + }, + { + "name": "Ori Livneh", + "email": "o...@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/wikimedia/cdb/src/Reader/Hash.php b/wikimedia/cdb/src/Reader/Hash.php index 3010305..36bbc3b 100644 --- a/wikimedia/cdb/src/Reader/Hash.php +++ b/wikimedia/cdb/src/Reader/Hash.php @@ -52,9 +52,9 @@ * @param string[] $data An associative PHP array. */ public function __construct( $data ) { - Assert::parameterType( 'array', $data, '$data' ); - Assert::parameterElementType( 'string', $data, '$data' ); - + if ( !is_array( $data ) ) { + throw new \InvalidArgumentException( __METHOD__ . ': "$data" must be an array.' ); + } $this->data = $data; } -- To view, visit https://gerrit.wikimedia.org/r/291680 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id8eb51b91058039c4d16b47d241382dcacd7ff41 Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/vendor Gerrit-Branch: master Gerrit-Owner: Ori.livneh <o...@wikimedia.org> Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org> Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits