jenkins-bot has submitted this change and it was merged. Change subject: rename UpdateTable script and fix it for production ......................................................................
rename UpdateTable script and fix it for production Change-Id: I828bb23cc258605cbcf9406d0e3ebaea8e7692b2 --- M README.md M composer.json R includes/UpdateExternalData/CsvImportSettings.php R includes/UpdateExternalData/ExternalDataImporter.php R maintenance/UpdateExternalData.php R tests/phpunit/UpdateExternalData/CsvImportSettingsTest.php R tests/phpunit/UpdateExternalData/UpdateExternalDataTest.php R tests/phpunit/UpdateExternalData/testdata/dump_information.csv R tests/phpunit/UpdateExternalData/testdata/external_values.csv 9 files changed, 26 insertions(+), 21 deletions(-) Approvals: Soeren.oldag: Looks good to me, approved jenkins-bot: Verified diff --git a/README.md b/README.md old mode 100644 new mode 100755 index 982371b..b17f1d1 --- a/README.md +++ b/README.md @@ -53,4 +53,4 @@ * Last but not least, you need to fill the tables that contain external data - for that you need the [dump converter script](https://github.com/WikidataQuality/DumpConverter). Follow the instruction in the README to create a tar file (that contains a number of csv files). -Run `php maintenance/runScript.php extensions/ExternalValidation/maintenance/UpdateTable.php --tar-file <path_to_tar_file>`. \ No newline at end of file +Run `php maintenance/runScript.php extensions/ExternalValidation/maintenance/UpdateExternalData.php --tar-file <path_to_tar_file>`. \ No newline at end of file diff --git a/composer.json b/composer.json index f03a304..2ba479b 100755 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ }, "classmap": [ "WikibaseQualityExternalValidationHooks.php", - "maintenance/UpdateTable.php" + "maintenance/UpdateExternalData.php" ] } } diff --git a/includes/UpdateTable/CsvImportSettings.php b/includes/UpdateExternalData/CsvImportSettings.php similarity index 92% rename from includes/UpdateTable/CsvImportSettings.php rename to includes/UpdateExternalData/CsvImportSettings.php index 19b2865..a91c803 100755 --- a/includes/UpdateTable/CsvImportSettings.php +++ b/includes/UpdateExternalData/CsvImportSettings.php @@ -1,6 +1,6 @@ <?php -namespace WikibaseQuality\ExternalValidation\UpdateTable; +namespace WikibaseQuality\ExternalValidation\UpdateExternalData; use InvalidArgumentException; use Wikimedia\Assert\Assert; @@ -11,7 +11,7 @@ * * Settings for importing data from csv files to a db table using a ExternalDataImporter * - * @package WikibaseQuality\ExternalValidation\UpdateTable + * @package WikibaseQuality\ExternalValidation\UpdateExternalData * @author BP2014N1 * @licence GNU GPL v2+ */ diff --git a/includes/UpdateTable/ExternalDataImporter.php b/includes/UpdateExternalData/ExternalDataImporter.php similarity index 96% rename from includes/UpdateTable/ExternalDataImporter.php rename to includes/UpdateExternalData/ExternalDataImporter.php index b4de222..2f8971a 100755 --- a/includes/UpdateTable/ExternalDataImporter.php +++ b/includes/UpdateExternalData/ExternalDataImporter.php @@ -1,6 +1,6 @@ <?php -namespace WikibaseQuality\ExternalValidation\UpdateTable; +namespace WikibaseQuality\ExternalValidation\UpdateExternalData; use PharData; use Wikibase\DataModel\Entity\ItemId; @@ -14,7 +14,7 @@ /** * Class ExternalDataImporter * - * @package WikibaseQuality\ExternalValidation\UpdateTable + * @package WikibaseQuality\ExternalValidation\UpdateExternalData * @author BP2014N1 * @license GNU GPL v2+ */ diff --git a/maintenance/UpdateTable.php b/maintenance/UpdateExternalData.php similarity index 76% rename from maintenance/UpdateTable.php rename to maintenance/UpdateExternalData.php index 4977525..eac7d1f 100755 --- a/maintenance/UpdateTable.php +++ b/maintenance/UpdateExternalData.php @@ -4,12 +4,18 @@ use Maintenance; use WikibaseQuality\ExternalValidation\ExternalValidationServices; -use WikibaseQuality\ExternalValidation\UpdateTable\CsvImportSettings; -use WikibaseQuality\ExternalValidation\UpdateTable\ExternalDataImporter; +use WikibaseQuality\ExternalValidation\UpdateExternalData\CsvImportSettings; +use WikibaseQuality\ExternalValidation\UpdateExternalData\ExternalDataImporter; + +if( !class_exists( '\Maintenance' ) ) { + $basePath = getenv( "MW_INSTALL_PATH" ) !== false ? getenv( "MW_INSTALL_PATH" ) : __DIR__ . + "/../../.."; + require_once $basePath . "/maintenance/Maintenance.php"; +} /** - * Class UpdateTable + * Class UpdateExternalData * * Maintenance script that evokes updates of wbqev_external_data, wbqev_dump_information, wbqev_identifier_properties * Input data is taken from tar file, which can be generated by DumpConverter tool. @@ -18,7 +24,7 @@ * @author BP2014N1 * @license GNU GPL v2+ */ -class UpdateTable extends Maintenance { +class UpdateExternalData extends Maintenance { public function __construct() { parent::__construct(); @@ -46,6 +52,6 @@ } // @codeCoverageIgnoreStart -$maintClass = 'WikibaseQuality\ExternalValidation\Maintenance\UpdateTable'; +$maintClass = 'WikibaseQuality\ExternalValidation\Maintenance\UpdateExternalData'; require_once RUN_MAINTENANCE_IF_MAIN; // @codeCoverageIgnoreEnd diff --git a/tests/phpunit/UpdateTable/CsvImportSettingsTest.php b/tests/phpunit/UpdateExternalData/CsvImportSettingsTest.php similarity index 82% rename from tests/phpunit/UpdateTable/CsvImportSettingsTest.php rename to tests/phpunit/UpdateExternalData/CsvImportSettingsTest.php index 37452a4..4f83947 100755 --- a/tests/phpunit/UpdateTable/CsvImportSettingsTest.php +++ b/tests/phpunit/UpdateExternalData/CsvImportSettingsTest.php @@ -1,12 +1,12 @@ <?php -namespace WikibaseQuality\ExternalValidation\Tests\UpdateTable; +namespace WikibaseQuality\ExternalValidation\Tests\UpdateExternalData; -use WikibaseQuality\ExternalValidation\UpdateTable\CsvImportSettings; +use WikibaseQuality\ExternalValidation\UpdateExternalData\CsvImportSettings; /** - * @covers WikibaseQuality\ExternalValidation\UpdateTable\CsvImportSettings + * @covers WikibaseQuality\ExternalValidation\UpdateExternalData\CsvImportSettings * * @group WikibaseQualityExternalValidation * diff --git a/tests/phpunit/UpdateTable/UpdateTableTest.php b/tests/phpunit/UpdateExternalData/UpdateExternalDataTest.php similarity index 88% rename from tests/phpunit/UpdateTable/UpdateTableTest.php rename to tests/phpunit/UpdateExternalData/UpdateExternalDataTest.php index 50edd5b..0d8b492 100755 --- a/tests/phpunit/UpdateTable/UpdateTableTest.php +++ b/tests/phpunit/UpdateExternalData/UpdateExternalDataTest.php @@ -1,19 +1,18 @@ <?php -namespace WikibaseQuality\ExternalValidation\Tests\UpdateTable; +namespace WikibaseQuality\ExternalValidation\Tests\UpdateExternalData; use Wikibase\DataModel\Entity\BasicEntityIdParser; use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\Entity\PropertyId; -use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation; use WikibaseQuality\ExternalValidation\DumpMetaInformation\SqlDumpMetaInformationRepo; use WikibaseQuality\ExternalValidation\ExternalDataRepo; -use WikibaseQuality\ExternalValidation\Maintenance\UpdateTable; +use WikibaseQuality\ExternalValidation\Maintenance\UpdateExternalData; /** - * @covers WikibaseQuality\ExternalValidation\UpdateTable\ExternalDataImporter - * @covers WikibaseQuality\ExternalValidation\UpdateTable\CsvImportSettings + * @covers WikibaseQuality\ExternalValidation\UpdateExternalData\ExternalDataImporter + * @covers WikibaseQuality\ExternalValidation\UpdateExternalData\CsvImportSettings * @covers WikibaseQuality\ExternalValidation\Maintenance\UpdateTable * * @group WikibaseQualityExternalValidation @@ -26,7 +25,7 @@ * @author BP2014N1 * @license GNU GPL v2+ */ -class UpdateTableTest extends \MediaWikiTestCase { +class UpdateExternalDataTest extends \MediaWikiTestCase { protected function setup() { parent::setup(); @@ -92,7 +91,7 @@ public function testExecute() { // Execute script - $maintenanceScript = new UpdateTable(); + $maintenanceScript = new UpdateExternalData(); $args = array( 'external-values-file' => __DIR__ . '/testdata/external_values.csv', 'dump-information-file' => __DIR__ . '/testdata/dump_information.csv', diff --git a/tests/phpunit/UpdateTable/testdata/dump_information.csv b/tests/phpunit/UpdateExternalData/testdata/dump_information.csv similarity index 100% rename from tests/phpunit/UpdateTable/testdata/dump_information.csv rename to tests/phpunit/UpdateExternalData/testdata/dump_information.csv diff --git a/tests/phpunit/UpdateTable/testdata/external_values.csv b/tests/phpunit/UpdateExternalData/testdata/external_values.csv similarity index 100% rename from tests/phpunit/UpdateTable/testdata/external_values.csv rename to tests/phpunit/UpdateExternalData/testdata/external_values.csv -- To view, visit https://gerrit.wikimedia.org/r/221629 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I828bb23cc258605cbcf9406d0e3ebaea8e7692b2 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation Gerrit-Branch: master Gerrit-Owner: Dominic.sauer <dominic.sa...@yahoo.de> Gerrit-Reviewer: Dominic.sauer <dominic.sa...@yahoo.de> Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com> Gerrit-Reviewer: Soeren.oldag <soeren_ol...@freenet.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
