Sync with upstream

.eslintignore

@@ -1,6 +1,11 @@
 docs
 jsdoc-plugins/*
-resources/videojs/*
+resources/lib/video.js/*
 resources/videojs-ogvjs/*
-resources/ogv.js/
+resources/lib/ogv.js/
 vendor/
+
+# Language files written automatically by TranslateWiki
+/i18n/**/*.json
+!/i18n/**/en.json
+!/i18n/**/qqq.json

.eslintrc.json

@@ -1,36 +1,6 @@
 {
 	"root": true,
-	"plugins": [
-		"no-jquery"
-	],
 	"extends": [
-		"plugin:no-jquery/deprecated",
-		"plugin:no-jquery/slim",
-		"wikimedia/client-es6",
-		"wikimedia/jquery",
-		"wikimedia/mediawiki"
-	],
-	"env": {
-		"browser": true
-	},
-	"globals": {
-		"videojs": true
-	},
-	"parserOptions": {
-		"sourceType": "module"
-	},
-	"rules": {
-		"jsdoc/no-undefined-types": "off",
-		"no-restricted-properties": "warn",
-		"compat/compat": "warn",
-		"es-x/no-array-prototype-fill": "warn"
-	},
-	"overrides": [
-		{
-			"files": [
-				"i18n/*"
-			],
-			"rules": { "security/detect-bidi-characters": "off" }
-		}
+		"wikimedia/server"
 	]
 }

.gitignore

@@ -7,3 +7,4 @@
 /vendor/
 /composer.lock
 .eslintcache
+/.stylelintcache

.mailmap

@@ -0,0 +1,6 @@
+# See: https://git-scm.com/docs/git-shortlog#_mapping_authors
+#
+Brooke Vibber <bvibber@wikimedia.org>
+Brooke Vibber <bvibber@wikimedia.org> <brion@wikimedia.org>
+Brooke Vibber <bvibber@wikimedia.org> <brion@pobox.com>
+Brooke Vibber <bvibber@wikimedia.org> <brion@users.mediawiki.org>

.phan/config.php

@@ -6,11 +6,4 @@
 	'pcntl' => $IP . '/.phan/internal_stubs/pcntl.phan_php',
 ];
 
-$cfg['exclude_analysis_directory_list'] = array_merge(
-	$cfg['exclude_analysis_directory_list'],
-	[
-		'includes/Handlers/OggHandler/File_Ogg',
-	]
-);
-
 return $cfg;

.phpcs.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <ruleset>
-	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
-		<exclude name="MediaWiki.Usage.ForbiddenFunctions.exec" />
-	</rule>
+	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki" />
 	<file>.</file>
 	<arg name="extensions" value="php"/>
 	<arg name="encoding" value="UTF-8"/>

.svgo.config.js

@@ -5,6 +5,8 @@
  * https://www.mediawiki.org/wiki/Manual:Coding_conventions/SVG#Exemplified_safe_configuration
  */
 
+'use strict';
+
 module.exports = {
 	plugins: [
 		{

Gruntfile.js

@@ -1,9 +1,9 @@
-/* eslint-env node, es6 */
+'use strict';
+
 module.exports = function ( grunt ) {
 	const conf = grunt.file.readJSON( 'extension.json' );
 
 	grunt.loadNpmTasks( 'grunt-banana-checker' );
-	grunt.loadNpmTasks( 'grunt-contrib-copy' );
 	grunt.loadNpmTasks( 'grunt-eslint' );
 	grunt.loadNpmTasks( 'grunt-exec' );
 	grunt.loadNpmTasks( 'grunt-patcher' );
@@ -12,15 +12,20 @@ module.exports = function ( grunt ) {
 	grunt.initConfig( {
 		eslint: {
 			options: {
-				cache: true
+				cache: true,
+				fix: grunt.option( 'fix' )
 			},
 			all: '.'
 		},
 		stylelint: {
+			options: {
+				cache: true
+			},
 			all: [
 				'**/*.{css,less}',
 				'!resources/mw-info-button/**',
 				// Third party resources
+				'!resources/lib/**',
 				'!resources/videojs*/**',
 				'!node_modules/**',
 				'!vendor/**'
@@ -31,47 +36,9 @@ module.exports = function ( grunt ) {
 				requireLowerCase: false
 			},
 			all: conf.MessagesDirs.TimedMediaHandler
-		},
-		copy: {
-			'ogv.js': {
-				expand: true,
-				cwd: 'node_modules/ogv/dist/',
-				src: [
-					'**'
-				],
-				dest: 'resources/ogv.js/'
-			},
-			'video.js': {
-				expand: true,
-				cwd: 'node_modules/video.js/dist/',
-				src: [
-					'**',
-					'!video.js',
-					'!alt/video.core.js',
-					'!alt/video.debug.js',
-					'!alt/*.css',
-					'!alt/*.novtt.js',
-					'!alt/*.novtt.min.js',
-					'!examples/**',
-					'!font/**',
-					'!types/**',
-					'!*.zip',
-					'!*.swf',
-					'!lang/*.json',
-					'!*.min.js',
-					'!**/*.min.css',
-					'!**/*.js.map',
-					'!**/*.cjs.js',
-					'!**/*.es.js',
-					'!ie8/**'
-				],
-				dest: 'resources/videojs/'
-			}
 		}
 	} );
 
-	grunt.registerTask( 'update-videojs', [ 'copy:video.js' ] );
-	grunt.registerTask( 'update-ogvjs', [ 'copy:ogv.js' ] );
 	grunt.registerTask( 'test', [ 'eslint', 'stylelint', 'banana' ] );
 	grunt.registerTask( 'default', 'test' );
 };

README.md

@@ -72,12 +72,20 @@ sometimes hours, which prevents that processing to be handled as a web service.
 Instead, the extension implements an asynchronous job, named webVideoTranscode,
 which you must be running regularly as your web server user.
 
-The job can be run using the MediaWiki `maintenance/runJobs.php` utility (do not
+The job can be run using the MediaWiki `maintenance/run.php` utility (do not
 forget to su as a webserver user):
 
 ```
-  php runJobs.php --type webVideoTranscode --maxjobs 1
-  php runJobs.php --type webVideoTranscodePrioritized --maxjobs 1
+  php run.php runJobs --type webVideoTranscode --maxjobs 1
+  php run.php runJobs --type webVideoTranscodePrioritized --maxjobs 1
+```
+
+Exclude these jobs from the default tasks your webserver executes
+by setting the following options in your `LocalSettings.php`.
+
+```
+$wgJobTypesExcludedFromDefaultQueue[] = 'webVideoTranscode';
+$wgJobTypesExcludedFromDefaultQueue[] = 'webVideoTranscodePrioritized';
 ```
 
 ## Included software or dependencies
@@ -96,14 +104,14 @@ Video.js code is released under the Apache 2.0 License:
 http://www.apache.org/licenses/LICENSE-2.0
 
 ### Ogv.js decoder
-Brion Vibber, a Wikimedia developer, created the JavaScript
+Brooke Vibber, a Wikimedia developer, created the JavaScript
 compatibility shim Ogv.js. It is a software decoding
 library for the file formats Ogg and WebM and the Vorbis,
 Theora, VP8 and VP9 codecs. It allows web browser without native
 HTML5 video support like iOS to support these formats.
 
 For more information about ogv.js visit:
-https://github.com/brion/ogv.js/
+https://github.com/bvibber/ogv.js/
 
 Ogv.js code is released under the MIT license:
 https://opensource.org/licenses/MIT

composer.json

@@ -1,19 +1,13 @@
 {
-	"repositories": [
-		{
-			"url": "https://github.com/wikimedia/getID3.git",
-			"type": "git"
-		}
-	],
 	"require": {
-		"wikimedia/getid3": "^v1.9.22"
+		"james-heinrich/getid3": "~1.9.25"
 	},
 	"require-dev": {
-		"mediawiki/mediawiki-codesniffer": "41.0.0",
-		"mediawiki/mediawiki-phan-config": "0.13.0",
-		"mediawiki/minus-x": "1.1.1",
+		"mediawiki/mediawiki-codesniffer": "48.0.0",
+		"mediawiki/mediawiki-phan-config": "0.17.0",
+		"mediawiki/minus-x": "1.1.3",
 		"php-parallel-lint/php-console-highlighter": "1.0.0",
-		"php-parallel-lint/php-parallel-lint": "1.3.2"
+		"php-parallel-lint/php-parallel-lint": "1.4.0"
 	},
 	"scripts": {
 		"test": [
@@ -27,5 +21,10 @@
 		],
 		"phan": "phan -d . --long-progress-bar",
 		"phpcs": "phpcs -sp --cache"
+	},
+	"config": {
+		"allow-plugins": {
+			"dealerdirect/phpcodesniffer-composer-installer": true
+		}
 	}
 }