jenkins-bot has submitted this change and it was merged.
Change subject: build: Updating development dependencies
......................................................................
build: Updating development dependencies
* jakub-onderka/php-parallel-lint: 0.8.* → 0.9
* mediawiki/mediawiki-codesniffer: 0.2.0 → 0.3.0
Change-Id: I0cb7e0a5c92b4a71f6dbdf3d6dd796bef2065cd5
---
M composer.json
M test/CdbTest.php
2 files changed, 48 insertions(+), 46 deletions(-)
Approvals:
Paladox: Looks good to me, but someone else must approve
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 366ac9f..5e4cba9 100644
--- a/composer.json
+++ b/composer.json
@@ -1,34 +1,36 @@
{
- "name": "wikimedia/cdb",
- "description": "Constant Database (CDB) wrapper library for PHP. Provides
pure-PHP fallback when dba_* functions are absent.",
- "license": "GPL-2.0",
- "homepage": "https://www.mediawiki.org/wiki/CDB";,
- "authors": [
- {
- "name": "Tim Starling",
- "email": "tstarl...@wikimedia.org"
- },
- {
- "name": "Chad Horohoe",
- "email": "c...@wikimedia.org"
- }
- ],
- "autoload": {
- "classmap": ["src/"]
- },
- "require": {
- "php": ">=5.3.2"
- },
- "require-dev": {
- "jakub-onderka/php-parallel-lint": "0.8.*",
- "phpunit/phpunit": "4.6.*",
- "mediawiki/mediawiki-codesniffer": "0.2.0"
- },
- "scripts": {
- "test": [
- "parallel-lint . --exclude vendor",
- "phpunit $PHPUNIT_ARGS",
- "phpcs -p"
- ]
- }
+ "name": "wikimedia/cdb",
+ "description": "Constant Database (CDB) wrapper library for PHP.
Provides pure-PHP fallback when dba_* functions are absent.",
+ "license": "GPL-2.0",
+ "homepage": "https://www.mediawiki.org/wiki/CDB";,
+ "authors": [
+ {
+ "name": "Tim Starling",
+ "email": "tstarl...@wikimedia.org"
+ },
+ {
+ "name": "Chad Horohoe",
+ "email": "c...@wikimedia.org"
+ }
+ ],
+ "autoload": {
+ "classmap": [
+ "src/"
+ ]
+ },
+ "require": {
+ "php": ">=5.3.2"
+ },
+ "require-dev": {
+ "jakub-onderka/php-parallel-lint": "0.9",
+ "phpunit/phpunit": "4.6.*",
+ "mediawiki/mediawiki-codesniffer": "0.3.0"
+ },
+ "scripts": {
+ "test": [
+ "parallel-lint . --exclude vendor",
+ "phpunit $PHPUNIT_ARGS",
+ "phpcs -p"
+ ]
+ }
}
diff --git a/test/CdbTest.php b/test/CdbTest.php
index 9da748a..ea89aa1 100644
--- a/test/CdbTest.php
+++ b/test/CdbTest.php
@@ -29,8 +29,8 @@
protected function tearDown() {
parent::tearDown();
- unlink($this->phpCdbFile);
- unlink($this->dbaCdbFile);
+ unlink( $this->phpCdbFile );
+ unlink( $this->dbaCdbFile );
}
/**
@@ -63,7 +63,7 @@
}
}
- unset($data['']);
+ unset( $data[''] );
$w1->close();
$w2->close();
@@ -99,23 +99,23 @@
$r1 = new Reader\PHP( $this->phpCdbFile );
$r2 = new Reader\DBA( $this->dbaCdbFile );
- $keys = array_keys($data);
- $firstKey = array_shift($keys);
+ $keys = array_keys( $data );
+ $firstKey = array_shift( $keys );
- $this->assertTrue($r1->exists($firstKey), 'PHP entry exists');
- $this->assertTrue($r2->exists($firstKey), 'DBA entry exists');
- $this->assertFalse($r1->exists(-1), 'PHP entry doesn\'t
exists');
- $this->assertFalse($r2->exists(-1), 'DBA entry doesn\'t
exists');
+ $this->assertTrue( $r1->exists( $firstKey ), 'PHP entry exists'
);
+ $this->assertTrue( $r2->exists( $firstKey ), 'DBA entry exists'
);
+ $this->assertFalse( $r1->exists( -1 ), 'PHP entry doesn\'t
exists' );
+ $this->assertFalse( $r2->exists( -1 ), 'DBA entry doesn\'t
exists' );
$firstKey1 = $r1->firstkey();
$firstKey2 = $r2->firstkey();
- $this->assertEquals($firstKey1, $firstKey, 'PHP Match first
key');
- $this->assertEquals($firstKey2, $firstKey, 'DBA Match first
key');
+ $this->assertEquals( $firstKey1, $firstKey, 'PHP Match first
key' );
+ $this->assertEquals( $firstKey2, $firstKey, 'DBA Match first
key' );
- unset($data[$firstKey]);
- for ($j = 0, $max = count($data); $j < $max; $j++) {
- $this->assertEquals($r2->nextkey(), $r1->nextkey(),
'nextkey match');
+ unset( $data[$firstKey] );
+ for ( $j = 0, $max = count( $data ); $j < $max; $j++ ) {
+ $this->assertEquals( $r2->nextkey(), $r1->nextkey(),
'nextkey match' );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/219468
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0cb7e0a5c92b4a71f6dbdf3d6dd796bef2065cd5
Gerrit-PatchSet: 3
Gerrit-Project: cdb
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
