wikimedia/mediawiki-skins-Vector
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/Vector.git synced 2024-11-27 17:10:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Normalise PHP namespaces used in Vector"

Browse source
This commit is contained in:
jenkins-bot 2022-05-23 23:30:34 +00:00 committed by Gerrit Code Review
parent 9d6d8e116d e46eef19d0
commit 501bdab2aa
21 changed files with 63 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/Constants.php
View file

@ -1,5 +1,5 @@
<?php
namespace Vector;
namespace MediaWiki\Skins\Vector;
use FatalError;

6
includes/FeatureManagement/FeatureManager.php
View file

@ -20,9 +20,9 @@
* @since 1.35
*/
namespace Vector\FeatureManagement;
namespace MediaWiki\Skins\Vector\FeatureManagement;
use Vector\FeatureManagement\Requirements\SimpleRequirement;
use MediaWiki\Skins\Vector\FeatureManagement\Requirements\SimpleRequirement;
use Wikimedia\Assert\Assert;
/**
@ -33,7 +33,7 @@ use Wikimedia\Assert\Assert;
*
* @unstable
*
* @package Vector\FeatureManagement
* @package MediaWiki\Skins\Vector\FeatureManagement
* @internal
*/
final class FeatureManager {

4
includes/FeatureManagement/Requirement.php
View file

@ -20,7 +20,7 @@
* @since 1.35
*/
namespace Vector\FeatureManagement;
namespace MediaWiki\Skins\Vector\FeatureManagement;
/**
* NOTE: This API hasn't settled. It may change at any time without warning. Please don't bind to
@ -28,7 +28,7 @@ namespace Vector\FeatureManagement;
*
* @unstable
*
* @package Vector\FeatureManagement
* @package MediaWiki\Skins\Vector\FeatureManagement
* @internal
*/
interface Requirement {

6
includes/FeatureManagement/Requirements/DynamicConfigRequirement.php
View file

@ -20,9 +20,9 @@
* @since 1.35
*/
namespace Vector\FeatureManagement\Requirements;
namespace MediaWiki\Skins\Vector\FeatureManagement\Requirements;
use Vector\FeatureManagement\Requirement;
use MediaWiki\Skins\Vector\FeatureManagement\Requirement;
/**
* Some application state changes throughout the lifetime of the application, e.g. `wgSitename` or
@ -61,7 +61,7 @@ use Vector\FeatureManagement\Requirement;
*
* @unstable
*
* @package Vector\FeatureManagement\Requirements
* @package MediaWiki\Skins\Vector\FeatureManagement\Requirements
* @internal
*/
final class DynamicConfigRequirement implements Requirement {

6
includes/FeatureManagement/Requirements/OverridableConfigRequirement.php
View file

@ -19,12 +19,12 @@
* @file
*/
namespace Vector\FeatureManagement\Requirements;
namespace MediaWiki\Skins\Vector\FeatureManagement\Requirements;
use CentralIdLookup;
use Config;
use MediaWiki\Skins\Vector\FeatureManagement\Requirement;
use User;
use Vector\FeatureManagement\Requirement;
use WebRequest;
/**
@ -63,7 +63,7 @@ use WebRequest;
* NOTE: This API hasn't settled. It may change at any time without warning. Please don't bind to
* it unless you absolutely need to
*
* @package Vector\FeatureManagement\Requirements
* @package MediaWiki\Skins\Vector\FeatureManagement\Requirements
*/
final class OverridableConfigRequirement implements Requirement {

6
includes/FeatureManagement/Requirements/SimpleRequirement.php
View file

@ -20,9 +20,9 @@
* @since 1.35
*/
namespace Vector\FeatureManagement\Requirements;
namespace MediaWiki\Skins\Vector\FeatureManagement\Requirements;
use Vector\FeatureManagement\Requirement;
use MediaWiki\Skins\Vector\FeatureManagement\Requirement;
/**
* NOTE: This API hasn't settled. It may change at any time without warning. Please don't bind to
@ -30,7 +30,7 @@ use Vector\FeatureManagement\Requirement;
*
* @unstable
*
* @package Vector\FeatureManagement\Requirements
* @package MediaWiki\Skins\Vector\FeatureManagement\Requirements
* @internal
*/
class SimpleRequirement implements Requirement {

2
includes/Hooks.php
View file

@ -1,6 +1,6 @@
<?php
namespace Vector;
namespace MediaWiki\Skins\Vector;
use Config;
use MediaWiki\Auth\Hook\LocalUserCreatedHook;

4
includes/ResourceLoader/VectorResourceLoaderUserModule.php
View file

@ -1,10 +1,10 @@
<?php
namespace Vector\ResourceLoader;
namespace MediaWiki\Skins\Vector\ResourceLoader;
use MediaWiki\Skins\Vector\Constants;
use ResourceLoaderContext;
use ResourceLoaderUserModule;
use Vector\Constants;
class VectorResourceLoaderUserModule extends ResourceLoaderUserModule {
/**

4
includes/ResourceLoader/VectorResourceLoaderUserStylesModule.php
View file

@ -1,10 +1,10 @@
<?php
namespace Vector\ResourceLoader;
namespace MediaWiki\Skins\Vector\ResourceLoader;
use MediaWiki\Skins\Vector\Constants;
use ResourceLoaderContext;
use ResourceLoaderUserStylesModule;
use Vector\Constants;
class VectorResourceLoaderUserStylesModule extends ResourceLoaderUserStylesModule {
/**

8
includes/ServiceWiring.php
View file

@ -23,10 +23,10 @@
*/
use MediaWiki\MediaWikiServices;
use Vector\Constants;
use Vector\FeatureManagement\FeatureManager;
use Vector\FeatureManagement\Requirements\DynamicConfigRequirement;
use Vector\FeatureManagement\Requirements\OverridableConfigRequirement;
use MediaWiki\Skins\Vector\Constants;
use MediaWiki\Skins\Vector\FeatureManagement\FeatureManager;
use MediaWiki\Skins\Vector\FeatureManagement\Requirements\DynamicConfigRequirement;
use MediaWiki\Skins\Vector\FeatureManagement\Requirements\OverridableConfigRequirement;
return [
Constants::SERVICE_FEATURE_MANAGER => static function ( MediaWikiServices $services ) {

2
includes/Services/LanguageService.php
View file

@ -1,6 +1,6 @@
<?php
namespace Vector\Services;
namespace MediaWiki\Skins\Vector\Services;
class LanguageService {
/**

2
includes/SkinVector.php
View file

@ -22,7 +22,7 @@
* @ingroup Skins
*/
namespace Vector;
namespace MediaWiki\Skins\Vector;
use ExtensionRegistry;
use Html;

2
includes/SkinVector22.php
View file

@ -1,6 +1,6 @@
<?php
namespace Vector;
namespace MediaWiki\Skins\Vector;
use MediaWiki\MediaWikiServices;

2
includes/SkinVectorLegacy.php
View file

@ -1,6 +1,6 @@
<?php
namespace Vector;
namespace MediaWiki\Skins\Vector;
/**
* @ingroup Skins

6
includes/VectorServices.php
View file

@ -1,10 +1,10 @@
<?php
namespace Vector;
namespace MediaWiki\Skins\Vector;
use MediaWiki\MediaWikiServices;
use Vector\FeatureManagement\FeatureManager;
use Vector\Services\LanguageService;
use MediaWiki\Skins\Vector\FeatureManagement\FeatureManager;
use MediaWiki\Skins\Vector\Services\LanguageService;
/**
* A service locator for services specific to Vector.

21
skin.json
View file

@ -25,7 +25,7 @@
},
"ValidSkinNames": {
"vector-2022": {
"class": "Vector\\SkinVector22",
"class": "MediaWiki\\Skins\\Vector\\SkinVector22",
"args": [
{
"name": "vector-2022",
@ -78,7 +78,7 @@
]
},
"vector": {
"class": "Vector\\SkinVectorLegacy",
"class": "MediaWiki\\Skins\\Vector\\SkinVectorLegacy",
"@args": "See SkinVector::__construct for more detail.",
"args": [
{
@ -129,14 +129,17 @@
]
},
"AutoloadNamespaces": {
"Vector\\": "includes/"
"MediaWiki\\Skins\\Vector\\": "includes/"
},
"TestAutoloadNamespaces": {
"MediaWiki\\Skins\\Vector\\Tests\\": "tests/phpunit/"
},
"ConfigRegistry": {
"vector": "GlobalVarConfig::newInstance"
},
"HookHandlers": {
"VectorHooks": {
"class": "Vector\\Hooks"
"class": "MediaWiki\\Skins\\Vector\\Hooks"
}
},
"Hooks": {
@ -151,10 +154,10 @@
"@note": "When modifying skins.vector.styles definition, make sure the installer still works",
"ResourceModules": {
"skins.vector.user": {
"class": "Vector\\ResourceLoader\\VectorResourceLoaderUserModule"
"class": "MediaWiki\\Skins\\Vector\\ResourceLoader\\VectorResourceLoaderUserModule"
},
"skins.vector.user.styles": {
"class": "Vector\\ResourceLoader\\VectorResourceLoaderUserStylesModule"
"class": "MediaWiki\\Skins\\Vector\\ResourceLoader\\VectorResourceLoaderUserStylesModule"
},
"skins.vector.search": {
"es6": true,
@ -170,7 +173,7 @@
"resources/skins.vector.search/App.vue",
{
"name": "resources/skins.vector.search/config.json",
"callback": "Vector\\Hooks::getVectorWvuiSearchResourceLoaderConfig"
"callback": "MediaWiki\\Skins\\Vector\\Hooks::getVectorWvuiSearchResourceLoaderConfig"
}
],
"messages": [
@ -299,7 +302,7 @@
"resources/skins.vector.es6/linkHijack.js",
{
"name": "resources/skins.vector.es6/config.json",
"callback": "Vector\\Hooks::getVectorResourceLoaderConfig"
"callback": "MediaWiki\\Skins\\Vector\\Hooks::getVectorResourceLoaderConfig"
}
],
"dependencies": [
@ -316,7 +319,7 @@
"resources/skins.vector.js/skin.js",
{
"name": "resources/skins.vector.js/config.json",
"callback": "Vector\\Hooks::getVectorResourceLoaderConfig"
"callback": "MediaWiki\\Skins\\Vector\\Hooks::getVectorResourceLoaderConfig"
},
"resources/skins.vector.js/dropdownMenus.js",
"resources/skins.vector.js/sidebar.js",

10
tests/phpunit/integration/SkinVectorTest.php
View file

@ -4,12 +4,12 @@ namespace MediaWiki\Skins\Vector\Tests\Integration;
use Exception;
use HashConfig;
use MediaWiki\MediaWikiServices;
use MediaWiki\Skins\Vector\SkinVector22;
use MediaWiki\Skins\Vector\SkinVectorLegacy;
use MediaWikiIntegrationTestCase;
use ReflectionMethod;
use RequestContext;
use Title;
use Vector\SkinVector22;
use Vector\SkinVectorLegacy;
use Wikimedia\TestingAccessWrapper;
/**
@ -178,7 +178,7 @@ class SkinVectorTest extends MediaWikiIntegrationTestCase {
}
/**
* @covers \Vector\SkinVector22::getTocData
* @covers \MediaWiki\Skins\Vector\SkinVector22::getTocData
* @dataProvider provideGetTOCData
*/
public function testGetTocData(
@ -198,7 +198,7 @@ class SkinVectorTest extends MediaWikiIntegrationTestCase {
}
/**
* @covers \Vector\SkinVector::getTemplateData
* @covers \MediaWiki\Skins\Vector\SkinVector::getTemplateData
*/
public function testGetTemplateData() {
$title = Title::newFromText( 'SkinVector' );
@ -422,7 +422,7 @@ class SkinVectorTest extends MediaWikiIntegrationTestCase {
/**
* @dataProvider providerLanguageAlertRequirements
* @covers \Vector\SkinVector::shouldLanguageAlertBeInSidebar
* @covers \MediaWiki\Skins\Vector\SkinVector::shouldLanguageAlertBeInSidebar
* @param array $requirements
* @param Title $title
* @param array $getLanguagesCached

10
tests/phpunit/integration/VectorHooksTest.php
View file

@ -7,6 +7,10 @@
namespace MediaWiki\Skins\Vector\Tests\Integration;
use HashConfig;
use MediaWiki\Skins\Vector\Constants;
use MediaWiki\Skins\Vector\Hooks;
use MediaWiki\Skins\Vector\SkinVector22;
use MediaWiki\Skins\Vector\SkinVectorLegacy;
use MediaWiki\User\UserOptionsManager;
use MediaWikiIntegrationTestCase;
use ReflectionMethod;
@ -15,16 +19,12 @@ use ResourceLoaderContext;
use RuntimeException;
use Title;
use User;
use Vector\Constants;
use Vector\Hooks;
use Vector\SkinVector22;
use Vector\SkinVectorLegacy;
/**
* Integration tests for Vector Hooks.
*
* @group Vector
* @coversDefaultClass \Vector\Hooks
* @coversDefaultClass \MediaWiki\Skins\Vector\Hooks
*/
class VectorHooksTest extends MediaWikiIntegrationTestCase {

6
tests/phpunit/unit/FeatureManagement/FeatureManagerTest.php
View file

@ -19,14 +19,14 @@
* @since 1.35
*/
namespace Vector\FeatureManagement\Tests;
namespace MediaWiki\Skins\Vector\Tests\Unit\FeatureManagement;
use Vector\FeatureManagement\FeatureManager;
use MediaWiki\Skins\Vector\FeatureManagement\FeatureManager;
/**
* @group Vector
* @group FeatureManagement
* @coversDefaultClass \Vector\FeatureManagement\FeatureManager
* @coversDefaultClass \MediaWiki\Skins\Vector\FeatureManagement\FeatureManager
*/
class FeatureManagerTest extends \MediaWikiUnitTestCase {

6
tests/phpunit/unit/FeatureManagement/Requirements/DynamicConfigRequirementTest.php
View file

@ -20,14 +20,14 @@
* @since 1.35
*/
namespace Vector\FeatureManagement\Tests;
namespace MediaWiki\Skins\Vector\Tests\Unit\FeatureManagement\Requirements;
use Vector\FeatureManagement\Requirements\DynamicConfigRequirement;
use MediaWiki\Skins\Vector\FeatureManagement\Requirements\DynamicConfigRequirement;
/**
* @group Vector
* @group FeatureManagement
* @coversDefaultClass \Vector\FeatureManagement\Requirements\DynamicConfigRequirement
* @coversDefaultClass \MediaWiki\Skins\Vector\FeatureManagement\Requirements\DynamicConfigRequirement
*/
class DynamicConfigRequirementTest extends \MediaWikiUnitTestCase {

8
tests/phpunit/unit/FeatureManagement/Requirements/OverridableConfigRequirementTest.php
View file

@ -18,19 +18,19 @@
* @file
*/
namespace Vector\FeatureManagement\Tests;
namespace MediaWiki\Skins\Vector\Tests\Unit\FeatureManagement\Requirements;
use CentralIdLookup;
use HashConfig;
use MediaWiki\Skins\Vector\Constants;
use MediaWiki\Skins\Vector\FeatureManagement\Requirements\OverridableConfigRequirement;
use User;
use Vector\Constants;
use Vector\FeatureManagement\Requirements\OverridableConfigRequirement;
use WebRequest;
/**
* @group Vector
* @group FeatureManagement
* @coversDefaultClass \Vector\FeatureManagement\Requirements\OverridableConfigRequirement
* @coversDefaultClass \MediaWiki\Skins\Vector\FeatureManagement\Requirements\OverridableConfigRequirement
*/
class OverridableConfigRequirementTest extends \MediaWikiUnitTestCase {