geckon01/PhpSpreadsheet
1
0
Fork 0
mirror of https://github.com/PHPOffice/PhpSpreadsheet.git synced 2026-09-04 22:50:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4723 from oleibman/xmltodo

Browse Source 
Eliminate TODO in Reader/Xml/Style/Border
This commit is contained in:
oleibman
2025-11-26 19:50:32 +00:00
committed by GitHub
parent 4d597c1aac b1b819e1f7
commit 097bea58b4
1 changed files with 20 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PhpSpreadsheet/Reader/Xml/Style/Border.php
+20 -30
View File
@@ -59,58 +59,48 @@ class Border extends StyleBase
{
$style = [];
$diagonalDirection = '';
$borderPosition = '';
$diagonalDirection = Borders::DIAGONAL_NONE;
foreach ($styleData->Border as $borderStyle) {
$borderAttributes = self::getAttributes($borderStyle, $namespaces['ss']);
/** @var array{color?: array{rgb: string}, borderStyle: string} */
$thisBorder = [];
$styleType = (string) $borderAttributes->Weight;
$styleType .= strtolower((string) $borderAttributes->LineStyle);
$thisBorder['borderStyle'] = self::BORDER_MAPPINGS['borderStyle'][$styleType] ?? BorderStyle::BORDER_NONE;
foreach ($borderAttributes as $borderStyleKey => $borderStyleValuex) {
$borderStyleValue = (string) $borderStyleValuex;
switch ($borderStyleKey) {
case 'Position':
/** @var string $diagonalDirection */
[$borderPosition, $diagonalDirection]
= $this->parsePosition($borderStyleValue, $diagonalDirection);
break;
case 'Color':
$borderColour = substr($borderStyleValue, 1);
$thisBorder['color']['rgb'] = $borderColour;
break;
}
$color = (string) ($borderAttributes['Color'] ?? '');
if ($color !== '') {
$thisBorder['color']['rgb'] = substr($color, 1);
}
/** @var int|string $borderPosition */
if ($borderPosition) {
$style['borders'][$borderPosition] = $thisBorder;
} elseif ($diagonalDirection) {
$style['borders']['diagonalDirection'] = $diagonalDirection;
$style['borders']['diagonal'] = $thisBorder;
$position = (string) ($borderAttributes['Position'] ?? '');
if ($position !== '') {
[$borderPosition, $diagonalDirection] = $this->parsePosition($position, $diagonalDirection);
if ($borderPosition) {
$style['borders'][$borderPosition] = $thisBorder;
} elseif ($diagonalDirection !== Borders::DIAGONAL_NONE) {
$style['borders']['diagonalDirection'] = $diagonalDirection;
$style['borders']['diagonal'] = $thisBorder;
}
}
}
return $style;
}
/** @return mixed[] */
protected function parsePosition(string $borderStyleValue, string $diagonalDirection): array
/** @return array{0: string, 1: int} */
protected function parsePosition(string $borderStyleValue, int $diagonalDirection): array
{
// TODO diagonalDirection seems to return int not string
$borderStyleValue = strtolower($borderStyleValue);
$borderPosition = '';
if (in_array($borderStyleValue, self::BORDER_POSITIONS)) {
$borderPosition = $borderStyleValue;
} elseif ($borderStyleValue === 'diagonalleft') {
$diagonalDirection = $diagonalDirection ? Borders::DIAGONAL_BOTH : Borders::DIAGONAL_DOWN;
$diagonalDirection = ($diagonalDirection !== Borders::DIAGONAL_NONE) ? Borders::DIAGONAL_BOTH : Borders::DIAGONAL_DOWN;
} elseif ($borderStyleValue === 'diagonalright') {
$diagonalDirection = $diagonalDirection ? Borders::DIAGONAL_BOTH : Borders::DIAGONAL_UP;
$diagonalDirection = ($diagonalDirection !== Borders::DIAGONAL_NONE) ? Borders::DIAGONAL_BOTH : Borders::DIAGONAL_UP;
}
return [$borderPosition ?? null, $diagonalDirection];
return [$borderPosition, $diagonalDirection];
}
}