Skip to content

[CLEANUP] Avoid Hungarian notation for size #1085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 5, 2025
Merged

[CLEANUP] Avoid Hungarian notation for size #1085

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions src/Value/Size.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class Size extends PrimitiveValue
/**
* @var float
*/
private $fSize;
private $size;

/**
* @var string|null
Expand All @@ -68,15 +68,15 @@ class Size extends PrimitiveValue
private $bIsColorComponent;

/**
* @param float|int|string $fSize
* @param float|int|string $size
* @param string|null $sUnit
* @param bool $bIsColorComponent
* @param int<0, max> $lineNumber
*/
public function __construct($fSize, $sUnit = null, $bIsColorComponent = false, $lineNumber = 0)
public function __construct($size, $sUnit = null, $bIsColorComponent = false, $lineNumber = 0)
{
parent::__construct($lineNumber);
$this->fSize = (float) $fSize;
$this->size = (float) $size;
$this->sUnit = $sUnit;
$this->bIsColorComponent = $bIsColorComponent;
}
Expand All @@ -91,22 +91,22 @@ public function __construct($fSize, $sUnit = null, $bIsColorComponent = false, $
*/
public static function parse(ParserState $parserState, $bIsColorComponent = false): Size
{
$sSize = '';
$size = '';
if ($parserState->comes('-')) {
$sSize .= $parserState->consume('-');
$size .= $parserState->consume('-');
}
while (\is_numeric($parserState->peek()) || $parserState->comes('.') || $parserState->comes('e', true)) {
if ($parserState->comes('.')) {
$sSize .= $parserState->consume('.');
$size .= $parserState->consume('.');
} elseif ($parserState->comes('e', true)) {
$sLookahead = $parserState->peek(1, 1);
if (\is_numeric($sLookahead) || $sLookahead === '+' || $sLookahead === '-') {
$sSize .= $parserState->consume(2);
$size .= $parserState->consume(2);
} else {
break; // Reached the unit part of the number like "em" or "ex"
}
} else {
$sSize .= $parserState->consume(1);
$size .= $parserState->consume(1);
}
}

Expand All @@ -121,7 +121,7 @@ public static function parse(ParserState $parserState, $bIsColorComponent = fals
}
}
}
return new Size((float) $sSize, $sUnit, $bIsColorComponent, $parserState->currentLine());
return new Size((float) $size, $sUnit, $bIsColorComponent, $parserState->currentLine());
}

/**
Expand Down Expand Up @@ -162,19 +162,19 @@ public function getUnit()
}

/**
* @param float|int|string $fSize
* @param float|int|string $size
*/
public function setSize($fSize): void
public function setSize($size): void
{
$this->fSize = (float) $fSize;
$this->size = (float) $size;
}

/**
* @return float
*/
public function getSize()
{
return $this->fSize;
return $this->size;
}

/**
Expand Down Expand Up @@ -204,7 +204,7 @@ public function isRelative(): bool
if (\in_array($this->sUnit, self::RELATIVE_SIZE_UNITS, true)) {
return true;
}
if ($this->sUnit === null && $this->fSize != 0) {
if ($this->sUnit === null && $this->size != 0) {
return true;
}
return false;
Expand All @@ -222,9 +222,9 @@ public function render(OutputFormat $outputFormat): string
{
$l = \localeconv();
$sPoint = \preg_quote($l['decimal_point'], '/');
$sSize = \preg_match('/[\\d\\.]+e[+-]?\\d+/i', (string) $this->fSize)
? \preg_replace("/$sPoint?0+$/", '', \sprintf('%f', $this->fSize)) : (string) $this->fSize;
return \preg_replace(["/$sPoint/", '/^(-?)0\\./'], ['.', '$1.'], $sSize)
$size = \preg_match('/[\\d\\.]+e[+-]?\\d+/i', (string) $this->size)
? \preg_replace("/$sPoint?0+$/", '', \sprintf('%f', $this->size)) : (string) $this->size;
return \preg_replace(["/$sPoint/", '/^(-?)0\\./'], ['.', '$1.'], $size)
. ($this->sUnit ?? '');
}
}