Merge "featureManager: Add typehints"
This commit is contained in:
commit
fbc24715e7
|
@ -1,4 +1,5 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -91,7 +92,7 @@ final class FeatureManager {
|
||||||
* @throws \InvalidArgumentException If the feature references a requirement that isn't
|
* @throws \InvalidArgumentException If the feature references a requirement that isn't
|
||||||
* registered
|
* registered
|
||||||
*/
|
*/
|
||||||
public function registerFeature( $feature, $requirements ) {
|
public function registerFeature( string $feature, $requirements ) {
|
||||||
//
|
//
|
||||||
// Validation
|
// Validation
|
||||||
if ( array_key_exists( $feature, $this->features ) ) {
|
if ( array_key_exists( $feature, $this->features ) ) {
|
||||||
|
@ -129,7 +130,7 @@ final class FeatureManager {
|
||||||
*
|
*
|
||||||
* @throws \InvalidArgumentException If the feature isn't registered
|
* @throws \InvalidArgumentException If the feature isn't registered
|
||||||
*/
|
*/
|
||||||
public function isFeatureEnabled( $feature ) {
|
public function isFeatureEnabled( string $feature ) : bool {
|
||||||
if ( !array_key_exists( $feature, $this->features ) ) {
|
if ( !array_key_exists( $feature, $this->features ) ) {
|
||||||
throw new \InvalidArgumentException( "The feature \"{$feature}\" isn't registered." );
|
throw new \InvalidArgumentException( "The feature \"{$feature}\" isn't registered." );
|
||||||
}
|
}
|
||||||
|
@ -161,13 +162,11 @@ final class FeatureManager {
|
||||||
*
|
*
|
||||||
* @throws \LogicException If the requirement has already been registered
|
* @throws \LogicException If the requirement has already been registered
|
||||||
*/
|
*/
|
||||||
public function registerRequirement( $name, $isMet ) {
|
public function registerRequirement( string $name, bool $isMet ) {
|
||||||
if ( array_key_exists( $name, $this->requirements ) ) {
|
if ( array_key_exists( $name, $this->requirements ) ) {
|
||||||
throw new \LogicException( "The requirement \"{$name}\" is already registered." );
|
throw new \LogicException( "The requirement \"{$name}\" is already registered." );
|
||||||
}
|
}
|
||||||
|
|
||||||
Assert::parameterType( 'boolean', $isMet, 'isMet' );
|
|
||||||
|
|
||||||
$this->requirements[$name] = $isMet;
|
$this->requirements[$name] = $isMet;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -179,7 +178,7 @@ final class FeatureManager {
|
||||||
*
|
*
|
||||||
* @throws \InvalidArgumentException If the requirement isn't registered
|
* @throws \InvalidArgumentException If the requirement isn't registered
|
||||||
*/
|
*/
|
||||||
public function isRequirementMet( $name ) {
|
public function isRequirementMet( string $name ) : bool {
|
||||||
if ( !array_key_exists( $name, $this->requirements ) ) {
|
if ( !array_key_exists( $name, $this->requirements ) ) {
|
||||||
throw new \InvalidArgumentException( "Requirement \"{$name}\" isn't registered." );
|
throw new \InvalidArgumentException( "Requirement \"{$name}\" isn't registered." );
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,16 +41,6 @@ class FeatureManagerTest extends \MediaWikiUnitTestCase {
|
||||||
$featureManager->registerRequirement( 'requirementA', true );
|
$featureManager->registerRequirement( 'requirementA', true );
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @covers ::registerRequirement
|
|
||||||
*/
|
|
||||||
public function testRegisterRequirementValidatesIsEnabled() {
|
|
||||||
$this->expectException( \Wikimedia\Assert\ParameterAssertionException::class );
|
|
||||||
|
|
||||||
$featureManager = new FeatureManager();
|
|
||||||
$featureManager->registerRequirement( 'requirementA', 'foo' );
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function provideInvalidFeatureConfig() {
|
public static function provideInvalidFeatureConfig() {
|
||||||
return [
|
return [
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue