Merge "Add AbstractBlock parent class for Block"

diff --combined includes/Block.php
index 3b2d395,2479def..6bfd7d3
--- 1/includes/Block.php
--- 2/includes/Block.php
+++ b/includes/Block.php
@@@ -22,13 -22,14 +22,14 @@@
  
  use Wikimedia\Rdbms\Database;
  use Wikimedia\Rdbms\IDatabase;
+ use MediaWiki\Block\AbstractBlock;
  use MediaWiki\Block\BlockRestrictionStore;
  use MediaWiki\Block\Restriction\Restriction;
  use MediaWiki\Block\Restriction\NamespaceRestriction;
  use MediaWiki\Block\Restriction\PageRestriction;
  use MediaWiki\MediaWikiServices;
  
- class Block {
+ class Block extends AbstractBlock {
        /** @var string */
        public $mReason;
  
@@@ -387,9 -388,8 +388,9 @@@
                        if ( $block->getType() == self::TYPE_RANGE ) {
                                # This is the number of bits that are allowed to vary in the block, give
                                # or take some floating point errors
 -                              $end = Wikimedia\base_convert( $block->getRangeEnd(), 16, 10 );
 -                              $start = Wikimedia\base_convert( $block->getRangeStart(), 16, 10 );
 +                              $prefix = 'v6-';
 +                              $end = Wikimedia\base_convert( ltrim( $block->getRangeEnd(), $prefix ), 16, 10 );
 +                              $start = Wikimedia\base_convert( ltrim( $block->getRangeStart(), $prefix ), 16, 10 );
                                $size = log( $end - $start + 1, 2 );
  
                                # Rank a range block covering a single IP equally with a single-IP block