Revert "Make lib and repo maintenance directories PSR-4 compatible"

The actual file names are lower case, thus this breaks
maintenance script autoloading.

This reverts commit 0d988c3.

Change-Id: I3dca2edc2f017868730706f32760c75e10c07c5c

client/maintenance/populateEntityUsage.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wikibase\Client\Maintenance;
+namespace Wikibase;
 
 use LoggedUpdateMaintenance;
 use Wikibase\Client\Usage\Sql\EntityUsageTableBuilder;

client/maintenance/populateInterwiki.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wikibase\Client\Maintenance;
+namespace Wikibase;
 
 use BagOStuff;
 use Http;

client/maintenance/updateSubscriptions.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wikibase\Client\Maintenance;
+namespace Wikibase;
 
 use Maintenance;
 use Wikibase\Client\Store\Sql\BulkSubscriptionUpdater;

composer.json

@@ -57,15 +57,15 @@
 			"client/tests/phpunit/MockClientStore.php",
 			"lib/includes/",
 			"lib/WikibaseLib.hooks.php",
+			"lib/maintenance/",
 			"repo/includes/",
+			"repo/maintenance/",
 			"repo/tests/phpunit/",
 			"repo/Wikibase.hooks.php"
 		],
 		"psr-4": {
 			"Wikibase\\Client\\Tests\\": "client/tests/phpunit/includes",
-			"Wikibase\\Lib\\Maintenance\\": "lib/maintenance",
 			"Wikibase\\Lib\\Tests\\": "lib/tests/phpunit",
-			"Wikibase\\Repo\\Maintenance\\": "repo/maintenance",
 			"Wikibase\\View\\": "view/src",
 			"Wikibase\\View\\Tests\\": "view/tests/phpunit"
 		}

lib/maintenance/populateSitesTable.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wikibase\Lib\Maintenance;
+namespace Wikibase;
 
 use Http;
 use Maintenance;

repo/includes/Store/Sql/DatabaseSchemaUpdater.php

@@ -6,7 +6,7 @@
 use DatabaseUpdater;
 use HashBagOStuff;
 use MWException;
-use Wikibase\Repo\Maintenance\RebuildTermsSearchKey;
+use Wikibase\RebuildTermsSearchKey;
 use Wikibase\Repo\Maintenance\RebuildEntityPerPage;
 use Wikibase\Store;
 use Wikibase\PropertyInfoTable;

repo/maintenance/changePropertyDataType.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wikibase\Repo\Maintenance;
+namespace Wikibase;
 
 use Exception;
 use InvalidArgumentException;

repo/maintenance/createBlacklistedItems.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wikibase\Repo\Maintenance;
+namespace Wikibase;
 
 use Maintenance;
 use Wikibase\DataModel\Entity\Item;

repo/maintenance/dispatchChanges.php

@@ -1,19 +1,17 @@
 <?php
 
-namespace Wikibase\Repo\Maintenance;
+namespace Wikibase;
 
 use Exception;
 use Maintenance;
 use MWException;
 use RequestContext;
-use Wikibase\ChunkCache;
 use Wikibase\Lib\Reporting\ObservableMessageReporter;
 use Wikibase\Lib\Reporting\ReportingExceptionHandler;
 use Wikibase\Lib\Store\ChangeLookup;
 use Wikibase\Repo\ChangeDispatcher;
 use Wikibase\Repo\Notifications\JobQueueChangeNotificationSender;
 use Wikibase\Repo\WikibaseRepo;
-use Wikibase\SettingsArray;
 use Wikibase\Store\Sql\SqlChangeDispatchCoordinator;
 use Wikibase\Store\Sql\SqlSubscriptionLookup;
 

repo/maintenance/dumpEntities.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wikibase\Repo\Maintenance;
+namespace Wikibase;
 
 use Maintenance;
 use MWException;

repo/maintenance/dumpJson.php

@@ -1,7 +1,8 @@
 <?php
 
-namespace Wikibase\Repo\Maintenance;
+namespace Wikibase;
 
+use DataValues\Serializers\DataValueSerializer;
 use Serializers\Serializer;
 use Wikibase\DataModel\SerializerFactory;
 use Wikibase\DataModel\Services\Entity\EntityPrefetcher;

repo/maintenance/dumpRdf.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wikibase\Repo\Maintenance;
+namespace Wikibase;
 
 use SiteStore;
 use Wikibase\DataModel\Services\Entity\EntityPrefetcher;

repo/maintenance/importProperties.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wikibase\Repo\Maintenance;
+namespace Wikibase;
 
 use Exception;
 use Maintenance;

repo/maintenance/populateChangesSubscription.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wikibase\Repo\Maintenance;
+namespace Wikibase;
 
 use LoggedUpdateMaintenance;
 use Wikibase\DataModel\Entity\ItemId;

repo/maintenance/pruneChanges.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wikibase\Repo\Maintenance;
+namespace Wikibase;
 
 use Maintenance;
 use Wikibase\Lib\Reporting\MessageReporter;

repo/maintenance/rebuildPropertyInfo.php

@@ -1,11 +1,9 @@
 <?php
 
-namespace Wikibase\Repo\Maintenance;
+namespace Wikibase;
 
 use LoggedUpdateMaintenance;
 use Wikibase\Lib\Reporting\ObservableMessageReporter;
-use Wikibase\PropertyInfoTable;
-use Wikibase\PropertyInfoTableBuilder;
 use Wikibase\Repo\WikibaseRepo;
 
 $basePath = getenv( 'MW_INSTALL_PATH' ) !== false ? getenv( 'MW_INSTALL_PATH' ) : __DIR__ . '/../../../..';

repo/maintenance/rebuildTermsSearchKey.php

@@ -1,11 +1,10 @@
 <?php
 
-namespace Wikibase\Repo\Maintenance;
+namespace Wikibase;
 
 use LoggedUpdateMaintenance;
 use Wikibase\Lib\Reporting\ObservableMessageReporter;
 use Wikibase\Repo\WikibaseRepo;
-use Wikibase\TermSearchKeyBuilder;
 
 $basePath = getenv( 'MW_INSTALL_PATH' ) !== false ? getenv( 'MW_INSTALL_PATH' ) : __DIR__ . '/../../../..';
 

repo/tests/phpunit/maintenance/dumpJsonTest.php

@@ -29,12 +29,12 @@
 use Wikibase\DataModel\Term\Fingerprint;
 use Wikibase\DataModel\Term\Term;
 use Wikibase\DataModel\Term\TermList;
-use Wikibase\Repo\Maintenance\DumpJson;
+use Wikibase\DumpJson;
 use Wikibase\Lib\Tests\MockRepository;
 use Wikibase\Repo\Tests\MockEntityPerPage;
 
 /**
- * @covers Wikibase\Repo\Maintenance\DumpJson
+ * @covers Wikibase\DumpJson
  *
  * @group WikibaseRepo
  * @group Wikibase

repo/tests/phpunit/maintenance/dumpRdfTest.php

@@ -29,14 +29,14 @@
 use Wikibase\DataModel\Term\Fingerprint;
 use Wikibase\DataModel\Term\Term;
 use Wikibase\DataModel\Term\TermList;
-use Wikibase\Repo\Maintenance\DumpRdf;
+use Wikibase\DumpRdf;
 use Wikibase\Lib\Tests\MockRepository;
 use Wikibase\Rdf\RdfVocabulary;
 use Wikibase\Repo\Tests\MockEntityPerPage;
 use Wikibase\Repo\WikibaseRepo;
 
 /**
- * @covers Wikibase\Repo\Maintenance\DumpRdf
+ * @covers Wikibase\DumpRdf
  *
  * @group WikibaseRepo
  * @group Wikibase