Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398406 )

Change subject: Switch to PSR-4 autoloader
......................................................................

Switch to PSR-4 autoloader

Change-Id: I591c9f242bfb760aa70098e11cce92273c572f07
---
D CommonsMetadata.php
M extension.json
R src/DataCollector.php
R src/DomNavigator.php
R src/HookHandler.php
R src/LicenseParser.php
R src/TemplateParser.php
7 files changed, 5 insertions(+), 20 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CommonsMetadata 
refs/changes/06/398406/1

diff --git a/CommonsMetadata.php b/CommonsMetadata.php
deleted file mode 100644
index f4b0729..0000000
--- a/CommonsMetadata.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-if ( function_exists( 'wfLoadExtension' ) ) {
-       wfLoadExtension( 'CommonsMetadata' );
-       // Keep i18n globals so mergeMessageFileList.php doesn't break
-       $wgMessagesDirs['CommonsMetadata'] = __DIR__ . '/i18n';
-       wfWarn(
-               'Deprecated PHP entry point used for CommonsMetadata extension. 
' .
-               'Please use wfLoadExtension instead, ' .
-               'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
-       );
-       return;
-} else {
-       die( 'This version of the CommonsMetadata extension requires MediaWiki 
1.25+' );
-}
diff --git a/extension.json b/extension.json
index 0018358..a787e06 100644
--- a/extension.json
+++ b/extension.json
@@ -5,6 +5,9 @@
        "descriptionmsg": "commonsmetadata-desc",
        "license-name": "GPL-2.0+",
        "type": "other",
+       "requires": {
+               "MediaWiki": ">= 1.31.0"
+       },
        "Hooks": {
                "GetExtendedMetadata": [
                        "CommonsMetadata\\HookHandler::onGetExtendedMetadata"
@@ -25,12 +28,8 @@
                "CommonsMetadataForceRecalculate": false,
                "CommonsMetadataSetTrackingCategories": false
        },
-       "AutoloadClasses": {
-               "CommonsMetadata\\HookHandler": "HookHandler.php",
-               "CommonsMetadata\\DataCollector": "DataCollector.php",
-               "CommonsMetadata\\DomNavigator": "DomNavigator.php",
-               "CommonsMetadata\\TemplateParser": "TemplateParser.php",
-               "CommonsMetadata\\LicenseParser": "LicenseParser.php"
+       "AutoloadNamespaces": {
+               "CommonsMetadata\\": "src/"
        },
        "TrackingCategories": [
                "commonsmetadata-trackingcategory-no-license",
diff --git a/DataCollector.php b/src/DataCollector.php
similarity index 100%
rename from DataCollector.php
rename to src/DataCollector.php
diff --git a/DomNavigator.php b/src/DomNavigator.php
similarity index 100%
rename from DomNavigator.php
rename to src/DomNavigator.php
diff --git a/HookHandler.php b/src/HookHandler.php
similarity index 100%
rename from HookHandler.php
rename to src/HookHandler.php
diff --git a/LicenseParser.php b/src/LicenseParser.php
similarity index 100%
rename from LicenseParser.php
rename to src/LicenseParser.php
diff --git a/TemplateParser.php b/src/TemplateParser.php
similarity index 100%
rename from TemplateParser.php
rename to src/TemplateParser.php

-- 
To view, visit https://gerrit.wikimedia.org/r/398406
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I591c9f242bfb760aa70098e11cce92273c572f07
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CommonsMetadata
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to