[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Use MediaWiki autoloader
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391036 ) Change subject: Use MediaWiki autoloader .. Use MediaWiki autoloader As long as extension registration does not handle PSR-4 autoloading. Bug: T180064 Change-Id: I86dda71eb04ad4703943f74c48fca3d9eae9f38a --- A build/generateAutoload.php M composer.json M extension.json 3 files changed, 126 insertions(+), 13 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/build/generateAutoload.php b/build/generateAutoload.php new file mode 100644 index 000..d7b52b3 --- /dev/null +++ b/build/generateAutoload.php @@ -0,0 +1,62 @@ +mDescription = 'Generates WikibaseQualityConstraints autoload data'; + } + + public function execute() { + $base = dirname( __DIR__ ); + $generator = new AutoloadGenerator( $base ); + $dirs = [ + 'api', + 'includes', + 'maintenance', + 'specials', + ]; + foreach ( $dirs as $dir ) { + $generator->readDir( $base . '/' . $dir ); + } + foreach ( glob( $base . '/*.php' ) as $file ) { + $generator->readFile( $file ); + } + $generator->readFile( $base . '/tests/phpunit/ConstraintParameters.php' ); + $generator->readFile( $base . '/tests/phpunit/DefaultConfig.php' ); + $generator->readFile( $base . '/tests/phpunit/ResultAssertions.php' ); + $generator->readFile( $base . '/tests/phpunit/SparqlHelperMock.php' ); + $generator->readFile( $base . '/tests/phpunit/TitleParserMock.php' ); + $generator->readFile( $base . '/tests/phpunit/Fake/FakeChecker.php' ); + $generator->readFile( $base . '/tests/phpunit/Fake/FakeSnakContext.php' ); + $generator->readFile( $base . '/tests/phpunit/Fake/InMemoryConstraintLookup.php' ); + + $target = $generator->getTargetFileInfo(); + + file_put_contents( + $target['filename'], + $generator->getAutoload( basename( __DIR__ ) . '/' . basename( __FILE__ ) ) + ); + + echo "Done.\n\n"; + } + +} + +$maintClass = GenerateAutoload::class; +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/composer.json b/composer.json index 22d6daf..dde6cb6 100644 --- a/composer.json +++ b/composer.json @@ -35,18 +35,6 @@ "wikibase/wikibase-codesniffer": "^0.2.0", "mediawiki/minus-x": "0.2.0" }, - "autoload": { - "psr-4": { - "WikibaseQuality\\ConstraintReport\\": "includes/", - "WikibaseQuality\\ConstraintReport\\Api\\": "api/", - "WikibaseQuality\\ConstraintReport\\Specials\\": "specials/", - "WikibaseQuality\\ConstraintReport\\Tests\\": "tests/phpunit/", - "WikibaseQuality\\ConstraintReport\\Maintenance\\": "maintenance/" - }, - "classmap": [ - "WikibaseQualityConstraintsHooks.php" - ] - }, "scripts": { "fix": [ "phpcbf", diff --git a/extension.json b/extension.json index 1c4b6f1..edce6dd 100644 --- a/extension.json +++ b/extension.json @@ -368,5 +368,68 @@ "public": true } }, - "manifest_version": 2 + "manifest_version": 2, + "AutoloadClasses": { + "WikibaseQuality\\ConstraintReport\\Api\\CheckConstraintParameters": "api/CheckConstraintParameters.php", + "WikibaseQuality\\ConstraintReport\\Api\\CheckConstraints": "api/CheckConstraints.php", + "WikibaseQuality\\ConstraintReport\\CachingConstraintLookup": "includes/CachingConstraintLookup.php", + "WikibaseQuality\\ConstraintReport\\Constraint": "includes/Constraint.php", + "WikibaseQuality\\ConstraintReport\\ConstraintCheck\\Checker\\CommonsLinkChecker": "includes/ConstraintCheck/Checker/CommonsLinkChecker.php", + "WikibaseQuality\\ConstraintReport\\ConstraintCheck\\Checker\\ConflictsWithChecker": "includes/ConstraintCheck/Checker/ConflictsWithChecker.php", + "WikibaseQuality\\ConstraintReport\\ConstraintCheck\\Checker\\DiffWithinRangeChecker": "includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php", + "WikibaseQuality\\ConstraintReport\\ConstraintCheck\\Checker\\FormatChecker": "includes/ConstraintCheck/Checker/FormatChecker.php", + "WikibaseQuality\\ConstraintReport\\ConstraintCheck\\Checker\\InverseChecker":
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Use MediaWiki autoloader
WMDE-leszek has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391036 ) Change subject: Use MediaWiki autoloader .. Use MediaWiki autoloader As long as extension registration does handle PSR-4 autoloading. Bug: T180064 Change-Id: I86dda71eb04ad4703943f74c48fca3d9eae9f38a --- A build/generateAutoload.php M composer.json M extension.json 3 files changed, 106 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints refs/changes/36/391036/1 diff --git a/build/generateAutoload.php b/build/generateAutoload.php new file mode 100644 index 000..84ba1e3 --- /dev/null +++ b/build/generateAutoload.php @@ -0,0 +1,53 @@ +mDescription = 'Generates WikibaseQualityConstraints autoload data'; + } + + public function execute() { + $base = dirname( __DIR__ ); + $generator = new AutoloadGenerator( $base ); + $dirs = [ + 'includes', + 'maintenance', + ]; + foreach ( $dirs as $dir ) { + $generator->readDir( $base . '/' . $dir ); + } + foreach ( glob( $base . '/*.php' ) as $file ) { + $generator->readFile( $file ); + } + + $target = $generator->getTargetFileInfo(); + + file_put_contents( + $target['filename'], + $generator->getAutoload( basename( __DIR__ ) . '/' . basename( __FILE__ ) ) + ); + + echo "Done.\n\n"; + } + +} + +$maintClass = GenerateAutoload::class; +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/composer.json b/composer.json index 22d6daf..dde6cb6 100644 --- a/composer.json +++ b/composer.json @@ -35,18 +35,6 @@ "wikibase/wikibase-codesniffer": "^0.2.0", "mediawiki/minus-x": "0.2.0" }, - "autoload": { - "psr-4": { - "WikibaseQuality\\ConstraintReport\\": "includes/", - "WikibaseQuality\\ConstraintReport\\Api\\": "api/", - "WikibaseQuality\\ConstraintReport\\Specials\\": "specials/", - "WikibaseQuality\\ConstraintReport\\Tests\\": "tests/phpunit/", - "WikibaseQuality\\ConstraintReport\\Maintenance\\": "maintenance/" - }, - "classmap": [ - "WikibaseQualityConstraintsHooks.php" - ] - }, "scripts": { "fix": [ "phpcbf", diff --git a/extension.json b/extension.json index 1c4b6f1..96504c3 100644 --- a/extension.json +++ b/extension.json @@ -368,5 +368,57 @@ "public": true } }, - "manifest_version": 2 + "manifest_version": 2, + "AutoloadClasses": { + "WikibaseQuality\\ConstraintReport\\CachingConstraintLookup": "includes/CachingConstraintLookup.php", + "WikibaseQuality\\ConstraintReport\\Constraint": "includes/Constraint.php", + "WikibaseQuality\\ConstraintReport\\ConstraintCheck\\Checker\\CommonsLinkChecker": "includes/ConstraintCheck/Checker/CommonsLinkChecker.php", + "WikibaseQuality\\ConstraintReport\\ConstraintCheck\\Checker\\ConflictsWithChecker": "includes/ConstraintCheck/Checker/ConflictsWithChecker.php", + "WikibaseQuality\\ConstraintReport\\ConstraintCheck\\Checker\\DiffWithinRangeChecker": "includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php", + "WikibaseQuality\\ConstraintReport\\ConstraintCheck\\Checker\\FormatChecker": "includes/ConstraintCheck/Checker/FormatChecker.php", + "WikibaseQuality\\ConstraintReport\\ConstraintCheck\\Checker\\InverseChecker": "includes/ConstraintCheck/Checker/InverseChecker.php", + "WikibaseQuality\\ConstraintReport\\ConstraintCheck\\Checker\\ItemChecker": "includes/ConstraintCheck/Checker/ItemChecker.php", + "WikibaseQuality\\ConstraintReport\\ConstraintCheck\\Checker\\MandatoryQualifiersChecker": "includes/ConstraintCheck/Checker/MandatoryQualifiersChecker.php", + "WikibaseQuality\\ConstraintReport\\ConstraintCheck\\Checker\\MultiValueChecker": "includes/ConstraintCheck/Checker/MultiValueChecker.php", + "WikibaseQuality\\ConstraintReport\\ConstraintCheck\\Checker\\OneOfChecker": "includes/ConstraintCheck/Checker/OneOfChecker.php", + "WikibaseQuality\\ConstraintReport\\ConstraintCheck\\Checker\\QualifierChecker": "includes/ConstraintCheck/Checker/QualifierChecker.php", + "WikibaseQuality\\ConstraintReport\\ConstraintCheck\\Checker\\QualifiersChecker": "includes/ConstraintCheck/Checker/QualifiersChecker.php", +