Libraryupgrader has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/385723 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 14.1.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 14.1.0
And moved phpcs.xml to .phpcs.xml (T177256).
Change-Id: If0c670d31b525e969333df331edaae8cbfcb3fbb
---
R .phpcs.xml
M WebVideoTranscode/WebVideoTranscode.php
M WebVideoTranscode/WebVideoTranscodeJob.php
M composer.json
M handlers/OggHandler/OggHandler.php
M tests/phpunit/ApiTestCaseVideoUpload.php
M tests/phpunit/TestTimeParsing.php
7 files changed, 15 insertions(+), 15 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/23/385723/1
diff --git a/phpcs.xml b/.phpcs.xml
similarity index 100%
rename from phpcs.xml
rename to .phpcs.xml
diff --git a/WebVideoTranscode/WebVideoTranscode.php
b/WebVideoTranscode/WebVideoTranscode.php
index b444c08..ce0a1f7 100644
--- a/WebVideoTranscode/WebVideoTranscode.php
+++ b/WebVideoTranscode/WebVideoTranscode.php
@@ -642,7 +642,7 @@
* Grabs sources from the remote repo via ApiQueryVideoInfo.php entry
point.
*
* TODO: This method could use some rethinking. See comments on PS1 of
- * <https://gerrit.wikimedia.org/r/#/c/117916/>
+ * <https://gerrit.wikimedia.org/r/#/c/117916/>
*
* Because this works with commons regardless of whether
TimedMediaHandler is installed or not
* @param File &$file
diff --git a/WebVideoTranscode/WebVideoTranscodeJob.php
b/WebVideoTranscode/WebVideoTranscodeJob.php
index cec23b2..6cfd250 100644
--- a/WebVideoTranscode/WebVideoTranscodeJob.php
+++ b/WebVideoTranscode/WebVideoTranscodeJob.php
@@ -954,11 +954,11 @@
}
/**
- * Kill Application PID
- *
- * @param int $pid
- * @return bool
- */
+ * Kill Application PID
+ *
+ * @param int $pid
+ * @return bool
+ */
public static function killProcess( $pid ) {
exec( "kill -9 $pid" );
exec( "ps $pid", $processState );
diff --git a/composer.json b/composer.json
index 1ba520c..cf7b3d5 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "13.0.0",
+ "mediawiki/mediawiki-codesniffer": "14.1.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/handlers/OggHandler/OggHandler.php
b/handlers/OggHandler/OggHandler.php
index 583c415..d2d0712 100644
--- a/handlers/OggHandler/OggHandler.php
+++ b/handlers/OggHandler/OggHandler.php
@@ -260,11 +260,11 @@
}
/**
- * Get useful response headers for GET/HEAD requests for a file with the
given metadata
- * @param array $metadata Contains this handler's unserialized
getMetadata() for a file
- * @return Array
- * @since 1.30
- */
+ * Get useful response headers for GET/HEAD requests for a file with
the given metadata
+ * @param array $metadata Contains this handler's unserialized
getMetadata() for a file
+ * @return Array
+ * @since 1.30
+ */
public function getContentHeaders( $metadata ) {
$packedMetadata = $metadata;
$result = [];
diff --git a/tests/phpunit/ApiTestCaseVideoUpload.php
b/tests/phpunit/ApiTestCaseVideoUpload.php
index 211bc4c..4cf98e1 100644
--- a/tests/phpunit/ApiTestCaseVideoUpload.php
+++ b/tests/phpunit/ApiTestCaseVideoUpload.php
@@ -51,7 +51,7 @@
* Fixture -- run after every test
* Clean up temporary files etc.
*
- */
+ */
protected function tearDown() {
parent::tearDown();
diff --git a/tests/phpunit/TestTimeParsing.php
b/tests/phpunit/TestTimeParsing.php
index 3e6b558..968c8be 100644
--- a/tests/phpunit/TestTimeParsing.php
+++ b/tests/phpunit/TestTimeParsing.php
@@ -10,7 +10,7 @@
class TestTimeParsing extends PHPUnit_Framework_TestCase {
/**
* Test time string to np2
- */
+ */
function testSeconds2NptFormat() {
// Some time conversions:
$this->assertEquals( TimedMediaHandler::seconds2npt( 100 ),
'00:01:40' );
@@ -26,7 +26,7 @@
/**
* Test time parsing to seconds
- */
+ */
function testParseTimeString() {
// Some time conversions:
$this->assertEquals( TimedMediaHandler::parseTimeString( 100 ),
100 );
--
To view, visit https://gerrit.wikimedia.org/r/385723
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If0c670d31b525e969333df331edaae8cbfcb3fbb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader <tools.libraryupgra...@tools.wmflabs.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
