[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

2017-07-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/368092 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
..


build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

Change-Id: I2bf16959dde2b51e8acabe2c9c7b9238c8a4bb4a
---
M TimedMediaHandler.hooks.php
M TimedMediaTransformOutput.php
M WebVideoTranscode/WebVideoTranscode.php
M composer.json
M phpcs.xml
5 files changed, 47 insertions(+), 48 deletions(-)

Approvals:
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved



diff --git a/TimedMediaHandler.hooks.php b/TimedMediaHandler.hooks.php
index 3f2029a..eae75c6 100644
--- a/TimedMediaHandler.hooks.php
+++ b/TimedMediaHandler.hooks.php
@@ -398,7 +398,7 @@
 */
public static function onImageOpenShowImageInlineBefore( &$imagePage, 
&$out ) {
$file = $imagePage->getDisplayedFile();
-   return TimedMediaHandlerHooks::onImagePageHooks( $file, $out );
+   return self::onImagePageHooks( $file, $out );
}
 
/**
@@ -410,7 +410,7 @@
 */
public static function onImagePageFileHistoryLine( $imagePage, $file, 
&$line, &$css ) {
$out = $imagePage->getContext()->getOutput();
-   return TimedMediaHandlerHooks::onImagePageHooks( $file, $out );
+   return self::onImagePageHooks( $file, $out );
}
 
/**
diff --git a/TimedMediaTransformOutput.php b/TimedMediaTransformOutput.php
index c45c640..02d296a 100644
--- a/TimedMediaTransformOutput.php
+++ b/TimedMediaTransformOutput.php
@@ -187,8 +187,8 @@
function getImagePopUp() {
// pop up videos set the autoplay attribute to true:
$autoPlay = true;
-   $id = TimedMediaTransformOutput::$serial;
-   TimedMediaTransformOutput::$serial++;
+   $id = self::$serial;
+   self::$serial++;
 
return Xml::tags( 'div', [
'id' => self::PLAYER_ID_PREFIX . $id,
@@ -416,8 +416,8 @@
$height .= 'px';
}
 
-   $id = TimedMediaTransformOutput::$serial;
-   TimedMediaTransformOutput::$serial++;
+   $id = self::$serial;
+   self::$serial++;
$mediaAttr = [
'id' => self::PLAYER_ID_PREFIX . $id,
// Get the correct size:
diff --git a/WebVideoTranscode/WebVideoTranscode.php 
b/WebVideoTranscode/WebVideoTranscode.php
index 0b12403..253fdc2 100644
--- a/WebVideoTranscode/WebVideoTranscode.php
+++ b/WebVideoTranscode/WebVideoTranscode.php
@@ -81,7 +81,7 @@
* http://firefogg.org/dev/index.html
*/
public static $derivativeSettings = [
-   WebVideoTranscode::ENC_OGV_160P =>
+   self::ENC_OGV_160P =>
[
'maxSize'=> '288x160',
'videoBitrate'   => '160',
@@ -96,7 +96,7 @@
'videoCodec' => 'theora',
'type'   => 'video/ogg; 
codecs="theora, vorbis"',
],
-   WebVideoTranscode::ENC_OGV_240P =>
+   self::ENC_OGV_240P =>
[
'maxSize'=> '426x240',
'videoBitrate'   => '512',
@@ -111,7 +111,7 @@
'videoCodec' => 'theora',
'type'   => 'video/ogg; 
codecs="theora, vorbis"',
],
-   WebVideoTranscode::ENC_OGV_360P =>
+   self::ENC_OGV_360P =>
[
'maxSize'=> '640x360',
'videoBitrate'   => '1024',
@@ -126,7 +126,7 @@
'videoCodec' => 'theora',
'type'   => 'video/ogg; 
codecs="theora, vorbis"',
],
-   WebVideoTranscode::ENC_OGV_480P =>
+   self::ENC_OGV_480P =>
[
'maxSize'=> '854x480',
'videoBitrate'   => '2048',
@@ -142,7 +142,7 @@
'type'   => 'video/ogg; 
codecs="theora, vorbis"',
],
 
-   WebVideoTranscode::ENC_OGV_720P =>
+   self::ENC_OGV_720P =>
[
'maxSize'=> '1280x720',
'videoQuality'   => 6,

[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

2017-07-26 Thread Umherirrender (Code Review) 
Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/368092 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
..

build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

Change-Id: I2bf16959dde2b51e8acabe2c9c7b9238c8a4bb4a
---
M TimedMediaHandler.hooks.php
M TimedMediaTransformOutput.php
M WebVideoTranscode/WebVideoTranscode.php
M composer.json
M phpcs.xml
5 files changed, 47 insertions(+), 48 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler 
refs/changes/92/368092/1

diff --git a/TimedMediaHandler.hooks.php b/TimedMediaHandler.hooks.php
index 3f2029a..eae75c6 100644
--- a/TimedMediaHandler.hooks.php
+++ b/TimedMediaHandler.hooks.php
@@ -398,7 +398,7 @@
 */
public static function onImageOpenShowImageInlineBefore( &$imagePage, 
&$out ) {
$file = $imagePage->getDisplayedFile();
-   return TimedMediaHandlerHooks::onImagePageHooks( $file, $out );
+   return self::onImagePageHooks( $file, $out );
}
 
/**
@@ -410,7 +410,7 @@
 */
public static function onImagePageFileHistoryLine( $imagePage, $file, 
&$line, &$css ) {
$out = $imagePage->getContext()->getOutput();
-   return TimedMediaHandlerHooks::onImagePageHooks( $file, $out );
+   return self::onImagePageHooks( $file, $out );
}
 
/**
diff --git a/TimedMediaTransformOutput.php b/TimedMediaTransformOutput.php
index c45c640..02d296a 100644
--- a/TimedMediaTransformOutput.php
+++ b/TimedMediaTransformOutput.php
@@ -187,8 +187,8 @@
function getImagePopUp() {
// pop up videos set the autoplay attribute to true:
$autoPlay = true;
-   $id = TimedMediaTransformOutput::$serial;
-   TimedMediaTransformOutput::$serial++;
+   $id = self::$serial;
+   self::$serial++;
 
return Xml::tags( 'div', [
'id' => self::PLAYER_ID_PREFIX . $id,
@@ -416,8 +416,8 @@
$height .= 'px';
}
 
-   $id = TimedMediaTransformOutput::$serial;
-   TimedMediaTransformOutput::$serial++;
+   $id = self::$serial;
+   self::$serial++;
$mediaAttr = [
'id' => self::PLAYER_ID_PREFIX . $id,
// Get the correct size:
diff --git a/WebVideoTranscode/WebVideoTranscode.php 
b/WebVideoTranscode/WebVideoTranscode.php
index 0b12403..253fdc2 100644
--- a/WebVideoTranscode/WebVideoTranscode.php
+++ b/WebVideoTranscode/WebVideoTranscode.php
@@ -81,7 +81,7 @@
* http://firefogg.org/dev/index.html
*/
public static $derivativeSettings = [
-   WebVideoTranscode::ENC_OGV_160P =>
+   self::ENC_OGV_160P =>
[
'maxSize'=> '288x160',
'videoBitrate'   => '160',
@@ -96,7 +96,7 @@
'videoCodec' => 'theora',
'type'   => 'video/ogg; 
codecs="theora, vorbis"',
],
-   WebVideoTranscode::ENC_OGV_240P =>
+   self::ENC_OGV_240P =>
[
'maxSize'=> '426x240',
'videoBitrate'   => '512',
@@ -111,7 +111,7 @@
'videoCodec' => 'theora',
'type'   => 'video/ogg; 
codecs="theora, vorbis"',
],
-   WebVideoTranscode::ENC_OGV_360P =>
+   self::ENC_OGV_360P =>
[
'maxSize'=> '640x360',
'videoBitrate'   => '1024',
@@ -126,7 +126,7 @@
'videoCodec' => 'theora',
'type'   => 'video/ogg; 
codecs="theora, vorbis"',
],
-   WebVideoTranscode::ENC_OGV_480P =>
+   self::ENC_OGV_480P =>
[
'maxSize'=> '854x480',
'videoBitrate'   => '2048',
@@ -142,7 +142,7 @@
'type'   => 'video/ogg; 
codecs="theora, vorbis"',
],
 
-   WebVideoTranscode::ENC_OGV_720P =>
+   self::ENC_OGV_720P =>
[
'maxSize'=> '1280x720',