diff --git a/src/PhpSpreadsheet/Calculation/Engine/Operands/StructuredReference.php b/src/PhpSpreadsheet/Calculation/Engine/Operands/StructuredReference.php index c1802ceb9..3cdb172f6 100644 --- a/src/PhpSpreadsheet/Calculation/Engine/Operands/StructuredReference.php +++ b/src/PhpSpreadsheet/Calculation/Engine/Operands/StructuredReference.php @@ -7,8 +7,9 @@ use PhpOffice\PhpSpreadsheet\Calculation\Exception; use PhpOffice\PhpSpreadsheet\Cell\Cell; use PhpOffice\PhpSpreadsheet\Cell\Coordinate; use PhpOffice\PhpSpreadsheet\Worksheet\Table; +use Stringable; -final class StructuredReference implements Operand +final class StructuredReference implements Operand, Stringable { public const NAME = 'Structured Reference'; diff --git a/src/PhpSpreadsheet/Cell/Cell.php b/src/PhpSpreadsheet/Cell/Cell.php index 6a532892b..2b05e58b0 100644 --- a/src/PhpSpreadsheet/Cell/Cell.php +++ b/src/PhpSpreadsheet/Cell/Cell.php @@ -14,8 +14,9 @@ use PhpOffice\PhpSpreadsheet\Style\NumberFormat; use PhpOffice\PhpSpreadsheet\Style\Style; use PhpOffice\PhpSpreadsheet\Worksheet\Table; use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet; +use Stringable; -class Cell +class Cell implements Stringable { /** * Value binder to use. diff --git a/src/PhpSpreadsheet/Cell/CellAddress.php b/src/PhpSpreadsheet/Cell/CellAddress.php index a5db0c217..880168001 100644 --- a/src/PhpSpreadsheet/Cell/CellAddress.php +++ b/src/PhpSpreadsheet/Cell/CellAddress.php @@ -4,8 +4,9 @@ namespace PhpOffice\PhpSpreadsheet\Cell; use PhpOffice\PhpSpreadsheet\Exception; use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet; +use Stringable; -class CellAddress +class CellAddress implements Stringable { protected ?Worksheet $worksheet; diff --git a/src/PhpSpreadsheet/Cell/CellRange.php b/src/PhpSpreadsheet/Cell/CellRange.php index 908a0d076..3063aa825 100644 --- a/src/PhpSpreadsheet/Cell/CellRange.php +++ b/src/PhpSpreadsheet/Cell/CellRange.php @@ -4,8 +4,9 @@ namespace PhpOffice\PhpSpreadsheet\Cell; use PhpOffice\PhpSpreadsheet\Exception; use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet; +use Stringable; -class CellRange implements AddressRange +class CellRange implements AddressRange, Stringable { /** * @var CellAddress diff --git a/src/PhpSpreadsheet/Cell/ColumnRange.php b/src/PhpSpreadsheet/Cell/ColumnRange.php index a5e256f97..934a8b72a 100644 --- a/src/PhpSpreadsheet/Cell/ColumnRange.php +++ b/src/PhpSpreadsheet/Cell/ColumnRange.php @@ -3,8 +3,9 @@ namespace PhpOffice\PhpSpreadsheet\Cell; use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet; +use Stringable; -class ColumnRange implements AddressRange +class ColumnRange implements AddressRange, Stringable { protected ?Worksheet $worksheet; diff --git a/src/PhpSpreadsheet/Cell/RowRange.php b/src/PhpSpreadsheet/Cell/RowRange.php index 61c82dd25..e28c524cb 100644 --- a/src/PhpSpreadsheet/Cell/RowRange.php +++ b/src/PhpSpreadsheet/Cell/RowRange.php @@ -3,8 +3,9 @@ namespace PhpOffice\PhpSpreadsheet\Cell; use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet; +use Stringable; -class RowRange implements AddressRange +class RowRange implements AddressRange, Stringable { protected ?Worksheet $worksheet; diff --git a/src/PhpSpreadsheet/Comment.php b/src/PhpSpreadsheet/Comment.php index 7696092af..ad521daff 100644 --- a/src/PhpSpreadsheet/Comment.php +++ b/src/PhpSpreadsheet/Comment.php @@ -9,8 +9,9 @@ use PhpOffice\PhpSpreadsheet\Shared\Drawing as SharedDrawing; use PhpOffice\PhpSpreadsheet\Style\Alignment; use PhpOffice\PhpSpreadsheet\Style\Color; use PhpOffice\PhpSpreadsheet\Worksheet\Drawing; +use Stringable; -class Comment implements IComparable +class Comment implements IComparable, Stringable { /** * Author. diff --git a/src/PhpSpreadsheet/Helper/Size.php b/src/PhpSpreadsheet/Helper/Size.php index 3659485ed..575ed890b 100644 --- a/src/PhpSpreadsheet/Helper/Size.php +++ b/src/PhpSpreadsheet/Helper/Size.php @@ -2,7 +2,9 @@ namespace PhpOffice\PhpSpreadsheet\Helper; -class Size +use Stringable; + +class Size implements Stringable { const REGEXP_SIZE_VALIDATION = '/^(?P\d*\.?\d+)(?Ppt|px|em)?$/i'; diff --git a/src/PhpSpreadsheet/RichText/RichText.php b/src/PhpSpreadsheet/RichText/RichText.php index 564b0fe44..7722d2f3f 100644 --- a/src/PhpSpreadsheet/RichText/RichText.php +++ b/src/PhpSpreadsheet/RichText/RichText.php @@ -5,8 +5,9 @@ namespace PhpOffice\PhpSpreadsheet\RichText; use PhpOffice\PhpSpreadsheet\Cell\Cell; use PhpOffice\PhpSpreadsheet\Cell\DataType; use PhpOffice\PhpSpreadsheet\IComparable; +use Stringable; -class RichText implements IComparable +class RichText implements IComparable, Stringable { /** * Rich text elements. diff --git a/src/PhpSpreadsheet/Style/NumberFormat/Wizard/DateTimeWizard.php b/src/PhpSpreadsheet/Style/NumberFormat/Wizard/DateTimeWizard.php index 4d7d27b28..8cd7da7cd 100644 --- a/src/PhpSpreadsheet/Style/NumberFormat/Wizard/DateTimeWizard.php +++ b/src/PhpSpreadsheet/Style/NumberFormat/Wizard/DateTimeWizard.php @@ -2,7 +2,9 @@ namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard; -abstract class DateTimeWizard implements Wizard +use Stringable; + +abstract class DateTimeWizard implements Stringable, Wizard { protected const NO_ESCAPING_NEEDED = "$+-/():!^&'~{}<>= "; diff --git a/src/PhpSpreadsheet/Style/NumberFormat/Wizard/NumberBase.php b/src/PhpSpreadsheet/Style/NumberFormat/Wizard/NumberBase.php index 73ab570f5..53f6b3dd8 100644 --- a/src/PhpSpreadsheet/Style/NumberFormat/Wizard/NumberBase.php +++ b/src/PhpSpreadsheet/Style/NumberFormat/Wizard/NumberBase.php @@ -5,8 +5,9 @@ namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard; use NumberFormatter; use PhpOffice\PhpSpreadsheet\Exception; use PhpOffice\PhpSpreadsheet\Style\NumberFormat; +use Stringable; -abstract class NumberBase +abstract class NumberBase implements Stringable { protected const MAX_DECIMALS = 30; diff --git a/src/PhpSpreadsheet/Worksheet/AutoFilter.php b/src/PhpSpreadsheet/Worksheet/AutoFilter.php index 3362cfb63..0742c3ab9 100644 --- a/src/PhpSpreadsheet/Worksheet/AutoFilter.php +++ b/src/PhpSpreadsheet/Worksheet/AutoFilter.php @@ -12,8 +12,9 @@ use PhpOffice\PhpSpreadsheet\Cell\Coordinate; use PhpOffice\PhpSpreadsheet\Exception; use PhpOffice\PhpSpreadsheet\Shared\Date; use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule; +use Stringable; -class AutoFilter +class AutoFilter implements Stringable { /** * Autofilter Worksheet. diff --git a/src/PhpSpreadsheet/Worksheet/Table.php b/src/PhpSpreadsheet/Worksheet/Table.php index 17ad0040c..e3de08b76 100644 --- a/src/PhpSpreadsheet/Worksheet/Table.php +++ b/src/PhpSpreadsheet/Worksheet/Table.php @@ -9,8 +9,9 @@ use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException; use PhpOffice\PhpSpreadsheet\Shared\StringHelper; use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Worksheet\Table\TableStyle; +use Stringable; -class Table +class Table implements Stringable { /** * Table Name. diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/FormulaArguments.php b/tests/PhpSpreadsheetTests/Calculation/Functions/FormulaArguments.php index d40cb1c43..16c5d81bc 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/FormulaArguments.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/FormulaArguments.php @@ -6,8 +6,9 @@ namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions; use PhpOffice\PhpSpreadsheet\Cell\CellAddress; use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet; +use Stringable; -class FormulaArguments +class FormulaArguments implements Stringable { /** * @var mixed[]