jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/375842 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.12.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.12.0
The following sniffs are failing and were disabled:
* MediaWiki.Commenting.FunctionComment.MissingParamComment
* MediaWiki.Files.ClassMatchesFilename.NotMatch
* MediaWiki.Files.OneClassPerFile.MultipleFound
* MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment
Also added "composer fix" command.
Change-Id: Iaf0e61cf6c6304421a5d6ac569aad8069fc0a665
---
M composer.json
M phpcs.xml
M src/WaitConditionLoop.php
M tests/WaitConditionLoopTest.php
4 files changed, 15 insertions(+), 5 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index b4040e1..70b39a9 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,9 @@
}
],
"autoload": {
- "classmap": ["src/"]
+ "classmap": [
+ "src/"
+ ]
},
"require": {
"php": ">=5.5.9"
@@ -18,7 +20,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"phpunit/phpunit": "4.8.24",
- "mediawiki/mediawiki-codesniffer": "0.7.2"
+ "mediawiki/mediawiki-codesniffer": "0.12.0"
},
"scripts": {
"test": [
@@ -28,6 +30,9 @@
],
"cover": [
"phpunit --coverage-html coverage"
+ ],
+ "fix": [
+ "phpcbf"
]
}
}
diff --git a/phpcs.xml b/phpcs.xml
index 91e2148..346f08e 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,6 +1,11 @@
<?xml version="1.0"?>
<ruleset name="WaitConditionLoop">
- <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/>
+ <rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+ <exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
+ <exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
+ <exclude name="MediaWiki.Files.OneClassPerFile.MultipleFound" />
+ <exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
+ </rule>
<file>.</file>
<exclude-pattern>coverage</exclude-pattern>
diff --git a/src/WaitConditionLoop.php b/src/WaitConditionLoop.php
index 803df56..17be403 100644
--- a/src/WaitConditionLoop.php
+++ b/src/WaitConditionLoop.php
@@ -109,7 +109,7 @@
break; // timeout reached
}
// Detect if condition callback seems to block or if
justs burns CPU
- $conditionUsesInterrupts = ( $real > 0.100 && $cpu <=
$real * .03 );
+ $conditionUsesInterrupts = ( $real > 0.100 && $cpu <=
$real * 0.03 );
if ( !$this->popAndRunBusyCallback() &&
!$conditionUsesInterrupts ) {
// 10 queries = 10(10+100)/2 ms = 550ms, 14
queries = 1050ms
$sleepUs = min( $sleepUs + 10 * 1e3, 1e6 ); //
stop incrementing at ~1s
diff --git a/tests/WaitConditionLoopTest.php b/tests/WaitConditionLoopTest.php
index 2357c09..cdc58ef 100644
--- a/tests/WaitConditionLoopTest.php
+++ b/tests/WaitConditionLoopTest.php
@@ -91,7 +91,7 @@
$count = 0;
$loop = new WaitConditionLoopFakeTime(
function () use ( &$count, &$wallClock ) {
- $wallClock += .1;
+ $wallClock += 0.1;
++$count;
return $count > 80 ? true : false;
--
To view, visit https://gerrit.wikimedia.org/r/375842
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf0e61cf6c6304421a5d6ac569aad8069fc0a665
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/libs/WaitConditionLoop
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
