wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-11-23 21:53:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up unused DEMPTY data type

Browse source 
Bug: T334640
Change-Id: Ie20d760b6e31a9dc97083d3fe4008fb31c990076
This commit is contained in:
Jean-Luc Hassec 2023-04-13 05:27:38 +00:00 committed by [[mw:User:Od1n]]
parent e89e094ffa
commit 6c500f8ea9
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
includes/Parser/AFPData.php
View file

@ -17,8 +17,6 @@ class AFPData {
public const DARRAY = 'array';
// Special purpose type for non-initialized stuff
public const DUNDEFINED = 'undefined';
// Special purpose for creating instances that will be populated later
public const DEMPTY = 'empty';
/**
* Translation table mapping shell-style wildcards to PCRE equivalents.
@ -67,9 +65,9 @@ class AFPData {
* @param AFPData[]|mixed|null $val
*/
public function __construct( $type, $val = null ) {
if ( ( $type === self::DUNDEFINED || $type === self::DEMPTY ) && $val !== null ) {
if ( $type === self::DUNDEFINED && $val !== null ) {
// Sanity
throw new InvalidArgumentException( 'DUNDEFINED and DEMPTY cannot have a non-null value' );
throw new InvalidArgumentException( 'DUNDEFINED cannot have a non-null value' );
}
$this->type = $type;
$this->data = $val;
@ -236,8 +234,7 @@ class AFPData {
} elseif ( $this->type === self::DINT ) {
return new AFPData( $this->type, -$this->toInt() );
} else {
$type = $this->type === self::DEMPTY ? self::DNULL : $this->type;
return new AFPData( $type, -$this->toFloat() );
return new AFPData( $this->type, -$this->toFloat() );
}
}
@ -445,7 +442,6 @@ class AFPData {
return $output;
case self::DNULL:
case self::DUNDEFINED:
case self::DEMPTY:
return null;
default:
// @codeCoverageIgnoreStart

1
tests/phpunit/unit/Parser/AFPDataTest.php
View file

@ -206,7 +206,6 @@ class AFPDataTest extends ParserTestCase {
),
[ 'foo', true ]
],
[ new AFPData( AFPData::DEMPTY ), null ],
];
}