From 2e4f6f5252635190b394e944fd006e84a3ac8377 Mon Sep 17 00:00:00 2001 From: Adrien Loison Date: Wed, 12 Jan 2022 23:29:16 +0100 Subject: [PATCH] Upgrade PHP and dev dependencies /!\ Removed PHP 7.2 support /!\ - PHPUnit 8 => 9 (+ fix the tests) - PHP-CS-Fixer 2 => 3 (+ fix the code) - Introduced PHP stan --- .github/workflows/ci.yml | 6 +-- .gitignore | 2 +- .php-cs-fixer.dist.php | 27 +++++------- composer.json | 9 ++-- src/Spout/Common/Entity/Cell.php | 14 +++---- src/Spout/Common/Entity/Style/Border.php | 24 +++++------ .../Common/Entity/Style/CellAlignment.php | 8 ++-- src/Spout/Common/Entity/Style/Color.php | 24 +++++------ src/Spout/Common/Entity/Style/Style.php | 6 +-- src/Spout/Common/Helper/EncodingHelper.php | 20 ++++----- .../Common/Manager/OptionsManagerAbstract.php | 2 +- src/Spout/Common/Type.php | 6 +-- src/Spout/Reader/CSV/RowIterator.php | 2 +- src/Spout/Reader/Common/Entity/Options.php | 14 +++---- src/Spout/Reader/Common/XMLProcessor.php | 12 +++--- .../Reader/ODS/Helper/CellValueFormatter.php | 42 +++++++++---------- .../Reader/ODS/Helper/SettingsHelper.php | 8 ++-- src/Spout/Reader/ODS/RowIterator.php | 12 +++--- src/Spout/Reader/ODS/SheetIterator.php | 18 ++++---- src/Spout/Reader/Wrapper/XMLReader.php | 2 +- .../Reader/XLSX/Helper/CellValueFormatter.php | 24 +++++------ .../Reader/XLSX/Helper/DateFormatHelper.php | 6 +-- .../CachingStrategyFactory.php | 4 +- .../FileBasedStrategy.php | 2 +- .../XLSX/Manager/SharedStringsManager.php | 16 +++---- .../Reader/XLSX/Manager/SheetManager.php | 30 ++++++------- .../Reader/XLSX/Manager/StyleManager.php | 18 ++++---- .../Manager/WorkbookRelationshipsManager.php | 18 ++++---- src/Spout/Reader/XLSX/RowIterator.php | 16 +++---- src/Spout/Writer/CSV/Writer.php | 2 +- src/Spout/Writer/Common/Entity/Options.php | 14 +++---- src/Spout/Writer/Common/Entity/Sheet.php | 2 +- src/Spout/Writer/Common/Helper/ZipHelper.php | 6 +-- .../Writer/Common/Manager/SheetManager.php | 2 +- .../Writer/ODS/Helper/FileSystemHelper.php | 18 ++++---- .../Writer/XLSX/Helper/FileSystemHelper.php | 24 +++++------ .../Writer/XLSX/Manager/OptionsManager.php | 4 +- .../XLSX/Manager/SharedStringsManager.php | 6 +-- .../Writer/XLSX/Manager/WorksheetManager.php | 4 +- .../Common/Helper/CellTypeHelperTest.php | 8 ++-- tests/Spout/Reader/CSV/SpoutTestStream.php | 6 +-- .../CachingStrategyFactoryTest.php | 2 +- tests/Spout/ReflectionHelper.php | 2 +- tests/Spout/Writer/ODS/SheetTest.php | 2 +- tests/Spout/Writer/ODS/WriterTest.php | 2 +- tests/Spout/Writer/XLSX/WriterTest.php | 2 +- 46 files changed, 247 insertions(+), 251 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 571d8af..64a4687 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,7 @@ jobs: tests-on-older-php: strategy: matrix: - php-versions: ['7.2', '7.3', '7.4'] + php-versions: ['7.3', '7.4'] runs-on: ubuntu-latest name: Tests - PHP ${{ matrix.php-versions }} env: @@ -209,7 +209,7 @@ jobs: run: composer install --no-progress --prefer-dist --optimize-autoloader - name: Run PHP-CS-Fixer - run: vendor/bin/php-cs-fixer fix --verbose --diff --dry-run --diff-format=udiff + run: vendor/bin/php-cs-fixer fix --verbose --diff --dry-run static-analysis: name: Static Analysis @@ -260,4 +260,4 @@ jobs: run: composer install --no-progress --prefer-dist --optimize-autoloader - name: Static Analysis using PHPStan - run: phpstan analyse --no-progress src/ + run: phpstan analyse --no-progress src tests diff --git a/.gitignore b/.gitignore index 6253664..cd87038 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,5 @@ /tests/coverage /vendor /composer.lock -/.php_cs.cache +/.php-cs-fixer.cache /.phpunit.result.cache diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index c7e7f81..403bba0 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -1,6 +1,12 @@ in(__DIR__) + ->name('*.php') + ->exclude('vendor'); + +$config = new PhpCsFixer\Config(); +return $config ->setRiskyAllowed(true) ->setRules([ '@Symfony' => true, @@ -13,8 +19,8 @@ $config = PhpCsFixer\Config::create() 'declare_equal_normalize' => ['space' => 'single'], 'heredoc_to_nowdoc' => true, 'increment_style' => ['style' => 'post'], - 'is_null' => ['use_yoda_style' => false], - 'method_argument_space' => ['ensure_fully_multiline' => true], + 'is_null' => true, + 'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'], 'modernize_types_casting' => true, 'no_break_comment' => ['comment_text' => 'do nothing'], 'no_empty_phpdoc' => false, @@ -44,16 +50,5 @@ $config = PhpCsFixer\Config::create() 'single_line_comment_style' => ['comment_types' => ['hash']], 'strict_comparison' => true, 'yoda_style' => ['equal' => false, 'identical' => false], - ]); - -$config->setFinder( - PhpCsFixer\Finder::create() - ->exclude('vendor') - ->in(__DIR__) - ->name('*.php') -); - -$cacheDir = getenv('TRAVIS') ? getenv('HOME') . '/.php-cs-fixer' : __DIR__; -$config->setCacheFile($cacheDir . '/.php_cs.cache'); - -return $config; + ]) + ->setFinder($finder); diff --git a/composer.json b/composer.json index 912349d..8bdd265 100644 --- a/composer.json +++ b/composer.json @@ -12,14 +12,15 @@ } ], "require": { - "php": ">=7.2.0", + "php": ">=7.3.0", "ext-zip": "*", "ext-xmlreader": "*", "ext-dom": "*" }, "require-dev": { - "phpunit/phpunit": "^8", - "friendsofphp/php-cs-fixer": "^2" + "phpunit/phpunit": "^9", + "friendsofphp/php-cs-fixer": "^3", + "phpstan/phpstan": "^1" }, "suggest": { "ext-iconv": "To handle non UTF-8 CSV files (if \"php-intl\" is not already installed or is too limited)", @@ -37,7 +38,7 @@ }, "config": { "platform": { - "php": "7.2" + "php": "7.3" } } } diff --git a/src/Spout/Common/Entity/Cell.php b/src/Spout/Common/Entity/Cell.php index 174831c..87157d4 100644 --- a/src/Spout/Common/Entity/Cell.php +++ b/src/Spout/Common/Entity/Cell.php @@ -13,38 +13,38 @@ class Cell /** * Numeric cell type (whole numbers, fractional numbers, dates) */ - const TYPE_NUMERIC = 0; + public const TYPE_NUMERIC = 0; /** * String (text) cell type */ - const TYPE_STRING = 1; + public const TYPE_STRING = 1; /** * Formula cell type * Not used at the moment */ - const TYPE_FORMULA = 2; + public const TYPE_FORMULA = 2; /** * Empty cell type */ - const TYPE_EMPTY = 3; + public const TYPE_EMPTY = 3; /** * Boolean cell type */ - const TYPE_BOOLEAN = 4; + public const TYPE_BOOLEAN = 4; /** * Date cell type */ - const TYPE_DATE = 5; + public const TYPE_DATE = 5; /** * Error cell type */ - const TYPE_ERROR = 6; + public const TYPE_ERROR = 6; /** * The value of this cell diff --git a/src/Spout/Common/Entity/Style/Border.php b/src/Spout/Common/Entity/Style/Border.php index bbf43ad..a6fd444 100644 --- a/src/Spout/Common/Entity/Style/Border.php +++ b/src/Spout/Common/Entity/Style/Border.php @@ -7,20 +7,20 @@ namespace Box\Spout\Common\Entity\Style; */ class Border { - const LEFT = 'left'; - const RIGHT = 'right'; - const TOP = 'top'; - const BOTTOM = 'bottom'; + public const LEFT = 'left'; + public const RIGHT = 'right'; + public const TOP = 'top'; + public const BOTTOM = 'bottom'; - const STYLE_NONE = 'none'; - const STYLE_SOLID = 'solid'; - const STYLE_DASHED = 'dashed'; - const STYLE_DOTTED = 'dotted'; - const STYLE_DOUBLE = 'double'; + public const STYLE_NONE = 'none'; + public const STYLE_SOLID = 'solid'; + public const STYLE_DASHED = 'dashed'; + public const STYLE_DOTTED = 'dotted'; + public const STYLE_DOUBLE = 'double'; - const WIDTH_THIN = 'thin'; - const WIDTH_MEDIUM = 'medium'; - const WIDTH_THICK = 'thick'; + public const WIDTH_THIN = 'thin'; + public const WIDTH_MEDIUM = 'medium'; + public const WIDTH_THICK = 'thick'; /** @var array A list of BorderPart objects for this border. */ private $parts = []; diff --git a/src/Spout/Common/Entity/Style/CellAlignment.php b/src/Spout/Common/Entity/Style/CellAlignment.php index 60fe833..0411fb9 100644 --- a/src/Spout/Common/Entity/Style/CellAlignment.php +++ b/src/Spout/Common/Entity/Style/CellAlignment.php @@ -8,10 +8,10 @@ namespace Box\Spout\Common\Entity\Style; */ abstract class CellAlignment { - const LEFT = 'left'; - const RIGHT = 'right'; - const CENTER = 'center'; - const JUSTIFY = 'justify'; + public const LEFT = 'left'; + public const RIGHT = 'right'; + public const CENTER = 'center'; + public const JUSTIFY = 'justify'; private static $VALID_ALIGNMENTS = [ self::LEFT => 1, diff --git a/src/Spout/Common/Entity/Style/Color.php b/src/Spout/Common/Entity/Style/Color.php index f2a4731..daf1c42 100644 --- a/src/Spout/Common/Entity/Style/Color.php +++ b/src/Spout/Common/Entity/Style/Color.php @@ -11,18 +11,18 @@ use Box\Spout\Common\Exception\InvalidColorException; abstract class Color { /** Standard colors - based on Office Online */ - const BLACK = '000000'; - const WHITE = 'FFFFFF'; - const RED = 'FF0000'; - const DARK_RED = 'C00000'; - const ORANGE = 'FFC000'; - const YELLOW = 'FFFF00'; - const LIGHT_GREEN = '92D040'; - const GREEN = '00B050'; - const LIGHT_BLUE = '00B0E0'; - const BLUE = '0070C0'; - const DARK_BLUE = '002060'; - const PURPLE = '7030A0'; + public const BLACK = '000000'; + public const WHITE = 'FFFFFF'; + public const RED = 'FF0000'; + public const DARK_RED = 'C00000'; + public const ORANGE = 'FFC000'; + public const YELLOW = 'FFFF00'; + public const LIGHT_GREEN = '92D040'; + public const GREEN = '00B050'; + public const LIGHT_BLUE = '00B0E0'; + public const BLUE = '0070C0'; + public const DARK_BLUE = '002060'; + public const PURPLE = '7030A0'; /** * Returns an RGB color from R, G and B values diff --git a/src/Spout/Common/Entity/Style/Style.php b/src/Spout/Common/Entity/Style/Style.php index 2bacc7a..b5f38f9 100644 --- a/src/Spout/Common/Entity/Style/Style.php +++ b/src/Spout/Common/Entity/Style/Style.php @@ -9,9 +9,9 @@ namespace Box\Spout\Common\Entity\Style; class Style { /** Default values */ - const DEFAULT_FONT_SIZE = 11; - const DEFAULT_FONT_COLOR = Color::BLACK; - const DEFAULT_FONT_NAME = 'Arial'; + public const DEFAULT_FONT_SIZE = 11; + public const DEFAULT_FONT_COLOR = Color::BLACK; + public const DEFAULT_FONT_NAME = 'Arial'; /** @var int|null Style ID */ private $id; diff --git a/src/Spout/Common/Helper/EncodingHelper.php b/src/Spout/Common/Helper/EncodingHelper.php index 62ddf60..3efe82f 100644 --- a/src/Spout/Common/Helper/EncodingHelper.php +++ b/src/Spout/Common/Helper/EncodingHelper.php @@ -11,18 +11,18 @@ use Box\Spout\Common\Exception\EncodingConversionException; class EncodingHelper { /** Definition of the encodings that can have a BOM */ - const ENCODING_UTF8 = 'UTF-8'; - const ENCODING_UTF16_LE = 'UTF-16LE'; - const ENCODING_UTF16_BE = 'UTF-16BE'; - const ENCODING_UTF32_LE = 'UTF-32LE'; - const ENCODING_UTF32_BE = 'UTF-32BE'; + public const ENCODING_UTF8 = 'UTF-8'; + public const ENCODING_UTF16_LE = 'UTF-16LE'; + public const ENCODING_UTF16_BE = 'UTF-16BE'; + public const ENCODING_UTF32_LE = 'UTF-32LE'; + public const ENCODING_UTF32_BE = 'UTF-32BE'; /** Definition of the BOMs for the different encodings */ - const BOM_UTF8 = "\xEF\xBB\xBF"; - const BOM_UTF16_LE = "\xFF\xFE"; - const BOM_UTF16_BE = "\xFE\xFF"; - const BOM_UTF32_LE = "\xFF\xFE\x00\x00"; - const BOM_UTF32_BE = "\x00\x00\xFE\xFF"; + public const BOM_UTF8 = "\xEF\xBB\xBF"; + public const BOM_UTF16_LE = "\xFF\xFE"; + public const BOM_UTF16_BE = "\xFE\xFF"; + public const BOM_UTF32_LE = "\xFF\xFE\x00\x00"; + public const BOM_UTF32_BE = "\x00\x00\xFE\xFF"; /** @var \Box\Spout\Common\Helper\GlobalFunctionsHelper Helper to work with global functions */ protected $globalFunctionsHelper; diff --git a/src/Spout/Common/Manager/OptionsManagerAbstract.php b/src/Spout/Common/Manager/OptionsManagerAbstract.php index 5670b95..6c42650 100644 --- a/src/Spout/Common/Manager/OptionsManagerAbstract.php +++ b/src/Spout/Common/Manager/OptionsManagerAbstract.php @@ -7,7 +7,7 @@ namespace Box\Spout\Common\Manager; */ abstract class OptionsManagerAbstract implements OptionsManagerInterface { - const PREFIX_OPTION = 'OPTION_'; + public const PREFIX_OPTION = 'OPTION_'; /** @var string[] List of all supported option names */ private $supportedOptions = []; diff --git a/src/Spout/Common/Type.php b/src/Spout/Common/Type.php index 24c0718..2f3c5bb 100644 --- a/src/Spout/Common/Type.php +++ b/src/Spout/Common/Type.php @@ -8,7 +8,7 @@ namespace Box\Spout\Common; */ abstract class Type { - const CSV = 'csv'; - const XLSX = 'xlsx'; - const ODS = 'ods'; + public const CSV = 'csv'; + public const XLSX = 'xlsx'; + public const ODS = 'ods'; } diff --git a/src/Spout/Reader/CSV/RowIterator.php b/src/Spout/Reader/CSV/RowIterator.php index 78e6650..1312d9c 100644 --- a/src/Spout/Reader/CSV/RowIterator.php +++ b/src/Spout/Reader/CSV/RowIterator.php @@ -19,7 +19,7 @@ class RowIterator implements IteratorInterface /** * Value passed to fgetcsv. 0 means "unlimited" (slightly slower but accomodates for very long lines). */ - const MAX_READ_BYTES_PER_LINE = 0; + public const MAX_READ_BYTES_PER_LINE = 0; /** @var resource Pointer to the CSV file to read */ protected $filePointer; diff --git a/src/Spout/Reader/Common/Entity/Options.php b/src/Spout/Reader/Common/Entity/Options.php index 293d4c0..c2d722d 100644 --- a/src/Spout/Reader/Common/Entity/Options.php +++ b/src/Spout/Reader/Common/Entity/Options.php @@ -9,15 +9,15 @@ namespace Box\Spout\Reader\Common\Entity; abstract class Options { // Common options - const SHOULD_FORMAT_DATES = 'shouldFormatDates'; - const SHOULD_PRESERVE_EMPTY_ROWS = 'shouldPreserveEmptyRows'; + public const SHOULD_FORMAT_DATES = 'shouldFormatDates'; + public const SHOULD_PRESERVE_EMPTY_ROWS = 'shouldPreserveEmptyRows'; // CSV specific options - const FIELD_DELIMITER = 'fieldDelimiter'; - const FIELD_ENCLOSURE = 'fieldEnclosure'; - const ENCODING = 'encoding'; + public const FIELD_DELIMITER = 'fieldDelimiter'; + public const FIELD_ENCLOSURE = 'fieldEnclosure'; + public const ENCODING = 'encoding'; // XLSX specific options - const TEMP_FOLDER = 'tempFolder'; - const SHOULD_USE_1904_DATES = 'shouldUse1904Dates'; + public const TEMP_FOLDER = 'tempFolder'; + public const SHOULD_USE_1904_DATES = 'shouldUse1904Dates'; } diff --git a/src/Spout/Reader/Common/XMLProcessor.php b/src/Spout/Reader/Common/XMLProcessor.php index 05ee970..3e812ee 100644 --- a/src/Spout/Reader/Common/XMLProcessor.php +++ b/src/Spout/Reader/Common/XMLProcessor.php @@ -11,16 +11,16 @@ use Box\Spout\Reader\Wrapper\XMLReader; class XMLProcessor { /* Node types */ - const NODE_TYPE_START = XMLReader::ELEMENT; - const NODE_TYPE_END = XMLReader::END_ELEMENT; + public const NODE_TYPE_START = XMLReader::ELEMENT; + public const NODE_TYPE_END = XMLReader::END_ELEMENT; /* Keys associated to reflection attributes to invoke a callback */ - const CALLBACK_REFLECTION_METHOD = 'reflectionMethod'; - const CALLBACK_REFLECTION_OBJECT = 'reflectionObject'; + public const CALLBACK_REFLECTION_METHOD = 'reflectionMethod'; + public const CALLBACK_REFLECTION_OBJECT = 'reflectionObject'; /* Values returned by the callbacks to indicate what the processor should do next */ - const PROCESSING_CONTINUE = 1; - const PROCESSING_STOP = 2; + public const PROCESSING_CONTINUE = 1; + public const PROCESSING_STOP = 2; /** @var \Box\Spout\Reader\Wrapper\XMLReader The XMLReader object that will help read sheet's XML data */ protected $xmlReader; diff --git a/src/Spout/Reader/ODS/Helper/CellValueFormatter.php b/src/Spout/Reader/ODS/Helper/CellValueFormatter.php index 168770f..77bd3c2 100644 --- a/src/Spout/Reader/ODS/Helper/CellValueFormatter.php +++ b/src/Spout/Reader/ODS/Helper/CellValueFormatter.php @@ -11,31 +11,31 @@ use Box\Spout\Reader\Exception\InvalidValueException; class CellValueFormatter { /** Definition of all possible cell types */ - const CELL_TYPE_STRING = 'string'; - const CELL_TYPE_FLOAT = 'float'; - const CELL_TYPE_BOOLEAN = 'boolean'; - const CELL_TYPE_DATE = 'date'; - const CELL_TYPE_TIME = 'time'; - const CELL_TYPE_CURRENCY = 'currency'; - const CELL_TYPE_PERCENTAGE = 'percentage'; - const CELL_TYPE_VOID = 'void'; + public const CELL_TYPE_STRING = 'string'; + public const CELL_TYPE_FLOAT = 'float'; + public const CELL_TYPE_BOOLEAN = 'boolean'; + public const CELL_TYPE_DATE = 'date'; + public const CELL_TYPE_TIME = 'time'; + public const CELL_TYPE_CURRENCY = 'currency'; + public const CELL_TYPE_PERCENTAGE = 'percentage'; + public const CELL_TYPE_VOID = 'void'; /** Definition of XML nodes names used to parse data */ - const XML_NODE_P = 'p'; - const XML_NODE_TEXT_A = 'text:a'; - const XML_NODE_TEXT_SPAN = 'text:span'; - const XML_NODE_TEXT_S = 'text:s'; - const XML_NODE_TEXT_TAB = 'text:tab'; - const XML_NODE_TEXT_LINE_BREAK = 'text:line-break'; + public const XML_NODE_P = 'p'; + public const XML_NODE_TEXT_A = 'text:a'; + public const XML_NODE_TEXT_SPAN = 'text:span'; + public const XML_NODE_TEXT_S = 'text:s'; + public const XML_NODE_TEXT_TAB = 'text:tab'; + public const XML_NODE_TEXT_LINE_BREAK = 'text:line-break'; /** Definition of XML attributes used to parse data */ - const XML_ATTRIBUTE_TYPE = 'office:value-type'; - const XML_ATTRIBUTE_VALUE = 'office:value'; - const XML_ATTRIBUTE_BOOLEAN_VALUE = 'office:boolean-value'; - const XML_ATTRIBUTE_DATE_VALUE = 'office:date-value'; - const XML_ATTRIBUTE_TIME_VALUE = 'office:time-value'; - const XML_ATTRIBUTE_CURRENCY = 'office:currency'; - const XML_ATTRIBUTE_C = 'text:c'; + public const XML_ATTRIBUTE_TYPE = 'office:value-type'; + public const XML_ATTRIBUTE_VALUE = 'office:value'; + public const XML_ATTRIBUTE_BOOLEAN_VALUE = 'office:boolean-value'; + public const XML_ATTRIBUTE_DATE_VALUE = 'office:date-value'; + public const XML_ATTRIBUTE_TIME_VALUE = 'office:time-value'; + public const XML_ATTRIBUTE_CURRENCY = 'office:currency'; + public const XML_ATTRIBUTE_C = 'text:c'; /** @var bool Whether date/time values should be returned as PHP objects or be formatted as strings */ protected $shouldFormatDates; diff --git a/src/Spout/Reader/ODS/Helper/SettingsHelper.php b/src/Spout/Reader/ODS/Helper/SettingsHelper.php index 7d47821..659d20a 100644 --- a/src/Spout/Reader/ODS/Helper/SettingsHelper.php +++ b/src/Spout/Reader/ODS/Helper/SettingsHelper.php @@ -11,12 +11,12 @@ use Box\Spout\Reader\ODS\Creator\InternalEntityFactory; */ class SettingsHelper { - const SETTINGS_XML_FILE_PATH = 'settings.xml'; + public const SETTINGS_XML_FILE_PATH = 'settings.xml'; /** Definition of XML nodes name and attribute used to parse settings data */ - const XML_NODE_CONFIG_ITEM = 'config:config-item'; - const XML_ATTRIBUTE_CONFIG_NAME = 'config:name'; - const XML_ATTRIBUTE_VALUE_ACTIVE_TABLE = 'ActiveTable'; + public const XML_NODE_CONFIG_ITEM = 'config:config-item'; + public const XML_ATTRIBUTE_CONFIG_NAME = 'config:name'; + public const XML_ATTRIBUTE_VALUE_ACTIVE_TABLE = 'ActiveTable'; /** @var InternalEntityFactory Factory to create entities */ private $entityFactory; diff --git a/src/Spout/Reader/ODS/RowIterator.php b/src/Spout/Reader/ODS/RowIterator.php index 81f0953..b804376 100644 --- a/src/Spout/Reader/ODS/RowIterator.php +++ b/src/Spout/Reader/ODS/RowIterator.php @@ -23,14 +23,14 @@ use Box\Spout\Reader\Wrapper\XMLReader; class RowIterator implements IteratorInterface { /** Definition of XML nodes names used to parse data */ - const XML_NODE_TABLE = 'table:table'; - const XML_NODE_ROW = 'table:table-row'; - const XML_NODE_CELL = 'table:table-cell'; - const MAX_COLUMNS_EXCEL = 16384; + public const XML_NODE_TABLE = 'table:table'; + public const XML_NODE_ROW = 'table:table-row'; + public const XML_NODE_CELL = 'table:table-cell'; + public const MAX_COLUMNS_EXCEL = 16384; /** Definition of XML attribute used to parse data */ - const XML_ATTRIBUTE_NUM_ROWS_REPEATED = 'table:number-rows-repeated'; - const XML_ATTRIBUTE_NUM_COLUMNS_REPEATED = 'table:number-columns-repeated'; + public const XML_ATTRIBUTE_NUM_ROWS_REPEATED = 'table:number-rows-repeated'; + public const XML_ATTRIBUTE_NUM_COLUMNS_REPEATED = 'table:number-columns-repeated'; /** @var \Box\Spout\Reader\Wrapper\XMLReader The XMLReader object that will help read sheet's XML data */ protected $xmlReader; diff --git a/src/Spout/Reader/ODS/SheetIterator.php b/src/Spout/Reader/ODS/SheetIterator.php index c7b8cd9..c396d79 100644 --- a/src/Spout/Reader/ODS/SheetIterator.php +++ b/src/Spout/Reader/ODS/SheetIterator.php @@ -15,18 +15,18 @@ use Box\Spout\Reader\Wrapper\XMLReader; */ class SheetIterator implements IteratorInterface { - const CONTENT_XML_FILE_PATH = 'content.xml'; + public const CONTENT_XML_FILE_PATH = 'content.xml'; - const XML_STYLE_NAMESPACE = 'urn:oasis:names:tc:opendocument:xmlns:style:1.0'; + public const XML_STYLE_NAMESPACE = 'urn:oasis:names:tc:opendocument:xmlns:style:1.0'; /** Definition of XML nodes name and attribute used to parse sheet data */ - const XML_NODE_AUTOMATIC_STYLES = 'office:automatic-styles'; - const XML_NODE_STYLE_TABLE_PROPERTIES = 'table-properties'; - const XML_NODE_TABLE = 'table:table'; - const XML_ATTRIBUTE_STYLE_NAME = 'style:name'; - const XML_ATTRIBUTE_TABLE_NAME = 'table:name'; - const XML_ATTRIBUTE_TABLE_STYLE_NAME = 'table:style-name'; - const XML_ATTRIBUTE_TABLE_DISPLAY = 'table:display'; + public const XML_NODE_AUTOMATIC_STYLES = 'office:automatic-styles'; + public const XML_NODE_STYLE_TABLE_PROPERTIES = 'table-properties'; + public const XML_NODE_TABLE = 'table:table'; + public const XML_ATTRIBUTE_STYLE_NAME = 'style:name'; + public const XML_ATTRIBUTE_TABLE_NAME = 'table:name'; + public const XML_ATTRIBUTE_TABLE_STYLE_NAME = 'table:style-name'; + public const XML_ATTRIBUTE_TABLE_DISPLAY = 'table:display'; /** @var string Path of the file to be read */ protected $filePath; diff --git a/src/Spout/Reader/Wrapper/XMLReader.php b/src/Spout/Reader/Wrapper/XMLReader.php index 6f85f32..5c2d2e8 100644 --- a/src/Spout/Reader/Wrapper/XMLReader.php +++ b/src/Spout/Reader/Wrapper/XMLReader.php @@ -11,7 +11,7 @@ class XMLReader extends \XMLReader { use XMLInternalErrorsHelper; - const ZIP_WRAPPER = 'zip://'; + public const ZIP_WRAPPER = 'zip://'; /** * Opens the XML Reader to read a file located inside a ZIP file. diff --git a/src/Spout/Reader/XLSX/Helper/CellValueFormatter.php b/src/Spout/Reader/XLSX/Helper/CellValueFormatter.php index ec83681..5fcd794 100644 --- a/src/Spout/Reader/XLSX/Helper/CellValueFormatter.php +++ b/src/Spout/Reader/XLSX/Helper/CellValueFormatter.php @@ -13,24 +13,24 @@ use Box\Spout\Reader\XLSX\Manager\StyleManager; class CellValueFormatter { /** Definition of all possible cell types */ - const CELL_TYPE_INLINE_STRING = 'inlineStr'; - const CELL_TYPE_STR = 'str'; - const CELL_TYPE_SHARED_STRING = 's'; - const CELL_TYPE_BOOLEAN = 'b'; - const CELL_TYPE_NUMERIC = 'n'; - const CELL_TYPE_DATE = 'd'; - const CELL_TYPE_ERROR = 'e'; + public const CELL_TYPE_INLINE_STRING = 'inlineStr'; + public const CELL_TYPE_STR = 'str'; + public const CELL_TYPE_SHARED_STRING = 's'; + public const CELL_TYPE_BOOLEAN = 'b'; + public const CELL_TYPE_NUMERIC = 'n'; + public const CELL_TYPE_DATE = 'd'; + public const CELL_TYPE_ERROR = 'e'; /** Definition of XML nodes names used to parse data */ - const XML_NODE_VALUE = 'v'; - const XML_NODE_INLINE_STRING_VALUE = 't'; + public const XML_NODE_VALUE = 'v'; + public const XML_NODE_INLINE_STRING_VALUE = 't'; /** Definition of XML attributes used to parse data */ - const XML_ATTRIBUTE_TYPE = 't'; - const XML_ATTRIBUTE_STYLE_ID = 's'; + public const XML_ATTRIBUTE_TYPE = 't'; + public const XML_ATTRIBUTE_STYLE_ID = 's'; /** Constants used for date formatting */ - const NUM_SECONDS_IN_ONE_DAY = 86400; + public const NUM_SECONDS_IN_ONE_DAY = 86400; /** @var SharedStringsManager Manages shared strings */ protected $sharedStringsManager; diff --git a/src/Spout/Reader/XLSX/Helper/DateFormatHelper.php b/src/Spout/Reader/XLSX/Helper/DateFormatHelper.php index 4435788..c84ee94 100644 --- a/src/Spout/Reader/XLSX/Helper/DateFormatHelper.php +++ b/src/Spout/Reader/XLSX/Helper/DateFormatHelper.php @@ -8,9 +8,9 @@ namespace Box\Spout\Reader\XLSX\Helper; */ class DateFormatHelper { - const KEY_GENERAL = 'general'; - const KEY_HOUR_12 = '12h'; - const KEY_HOUR_24 = '24h'; + public const KEY_GENERAL = 'general'; + public const KEY_HOUR_12 = '12h'; + public const KEY_HOUR_24 = '24h'; /** * This map is used to replace Excel format characters by their PHP equivalent. diff --git a/src/Spout/Reader/XLSX/Manager/SharedStringsCaching/CachingStrategyFactory.php b/src/Spout/Reader/XLSX/Manager/SharedStringsCaching/CachingStrategyFactory.php index 1c00a52..9afec2f 100644 --- a/src/Spout/Reader/XLSX/Manager/SharedStringsCaching/CachingStrategyFactory.php +++ b/src/Spout/Reader/XLSX/Manager/SharedStringsCaching/CachingStrategyFactory.php @@ -37,7 +37,7 @@ class CachingStrategyFactory * This means that in order to store one shared string in memory, the memory amount needed is: * => 20 * 600 ≈ 12KB */ - const AMOUNT_MEMORY_NEEDED_PER_STRING_IN_KB = 12; + public const AMOUNT_MEMORY_NEEDED_PER_STRING_IN_KB = 12; /** * To avoid running out of memory when extracting a huge number of shared strings, they can be saved to temporary files @@ -48,7 +48,7 @@ class CachingStrategyFactory * best when the indexes of the shared strings are sorted in the sheet data. * 10,000 was chosen because it creates small files that are fast to be loaded in memory. */ - const MAX_NUM_STRINGS_PER_TEMP_FILE = 10000; + public const MAX_NUM_STRINGS_PER_TEMP_FILE = 10000; /** * Returns the best caching strategy, given the number of unique shared strings diff --git a/src/Spout/Reader/XLSX/Manager/SharedStringsCaching/FileBasedStrategy.php b/src/Spout/Reader/XLSX/Manager/SharedStringsCaching/FileBasedStrategy.php index 0e743b4..60e69b0 100644 --- a/src/Spout/Reader/XLSX/Manager/SharedStringsCaching/FileBasedStrategy.php +++ b/src/Spout/Reader/XLSX/Manager/SharedStringsCaching/FileBasedStrategy.php @@ -15,7 +15,7 @@ use Box\Spout\Reader\XLSX\Creator\HelperFactory; class FileBasedStrategy implements CachingStrategyInterface { /** Value to use to escape the line feed character ("\n") */ - const ESCAPED_LINE_FEED_CHARACTER = '_x000A_'; + public const ESCAPED_LINE_FEED_CHARACTER = '_x000A_'; /** @var \Box\Spout\Common\Helper\GlobalFunctionsHelper Helper to work with global functions */ protected $globalFunctionsHelper; diff --git a/src/Spout/Reader/XLSX/Manager/SharedStringsManager.php b/src/Spout/Reader/XLSX/Manager/SharedStringsManager.php index 81b4ba2..46cbe6d 100644 --- a/src/Spout/Reader/XLSX/Manager/SharedStringsManager.php +++ b/src/Spout/Reader/XLSX/Manager/SharedStringsManager.php @@ -17,16 +17,16 @@ use Box\Spout\Reader\XLSX\Manager\SharedStringsCaching\CachingStrategyInterface; class SharedStringsManager { /** Definition of XML nodes names used to parse data */ - const XML_NODE_SST = 'sst'; - const XML_NODE_SI = 'si'; - const XML_NODE_R = 'r'; - const XML_NODE_T = 't'; + public const XML_NODE_SST = 'sst'; + public const XML_NODE_SI = 'si'; + public const XML_NODE_R = 'r'; + public const XML_NODE_T = 't'; /** Definition of XML attributes used to parse data */ - const XML_ATTRIBUTE_COUNT = 'count'; - const XML_ATTRIBUTE_UNIQUE_COUNT = 'uniqueCount'; - const XML_ATTRIBUTE_XML_SPACE = 'xml:space'; - const XML_ATTRIBUTE_VALUE_PRESERVE = 'preserve'; + public const XML_ATTRIBUTE_COUNT = 'count'; + public const XML_ATTRIBUTE_UNIQUE_COUNT = 'uniqueCount'; + public const XML_ATTRIBUTE_XML_SPACE = 'xml:space'; + public const XML_ATTRIBUTE_VALUE_PRESERVE = 'preserve'; /** @var string Path of the XLSX file being read */ protected $filePath; diff --git a/src/Spout/Reader/XLSX/Manager/SheetManager.php b/src/Spout/Reader/XLSX/Manager/SheetManager.php index e7b41e0..686a5ef 100644 --- a/src/Spout/Reader/XLSX/Manager/SheetManager.php +++ b/src/Spout/Reader/XLSX/Manager/SheetManager.php @@ -14,27 +14,27 @@ use Box\Spout\Reader\XLSX\Sheet; class SheetManager { /** Paths of XML files relative to the XLSX file root */ - const WORKBOOK_XML_RELS_FILE_PATH = 'xl/_rels/workbook.xml.rels'; - const WORKBOOK_XML_FILE_PATH = 'xl/workbook.xml'; + public const WORKBOOK_XML_RELS_FILE_PATH = 'xl/_rels/workbook.xml.rels'; + public const WORKBOOK_XML_FILE_PATH = 'xl/workbook.xml'; /** Definition of XML node names used to parse data */ - const XML_NODE_WORKBOOK_PROPERTIES = 'workbookPr'; - const XML_NODE_WORKBOOK_VIEW = 'workbookView'; - const XML_NODE_SHEET = 'sheet'; - const XML_NODE_SHEETS = 'sheets'; - const XML_NODE_RELATIONSHIP = 'Relationship'; + public const XML_NODE_WORKBOOK_PROPERTIES = 'workbookPr'; + public const XML_NODE_WORKBOOK_VIEW = 'workbookView'; + public const XML_NODE_SHEET = 'sheet'; + public const XML_NODE_SHEETS = 'sheets'; + public const XML_NODE_RELATIONSHIP = 'Relationship'; /** Definition of XML attributes used to parse data */ - const XML_ATTRIBUTE_DATE_1904 = 'date1904'; - const XML_ATTRIBUTE_ACTIVE_TAB = 'activeTab'; - const XML_ATTRIBUTE_R_ID = 'r:id'; - const XML_ATTRIBUTE_NAME = 'name'; - const XML_ATTRIBUTE_STATE = 'state'; - const XML_ATTRIBUTE_ID = 'Id'; - const XML_ATTRIBUTE_TARGET = 'Target'; + public const XML_ATTRIBUTE_DATE_1904 = 'date1904'; + public const XML_ATTRIBUTE_ACTIVE_TAB = 'activeTab'; + public const XML_ATTRIBUTE_R_ID = 'r:id'; + public const XML_ATTRIBUTE_NAME = 'name'; + public const XML_ATTRIBUTE_STATE = 'state'; + public const XML_ATTRIBUTE_ID = 'Id'; + public const XML_ATTRIBUTE_TARGET = 'Target'; /** State value to represent a hidden sheet */ - const SHEET_STATE_HIDDEN = 'hidden'; + public const SHEET_STATE_HIDDEN = 'hidden'; /** @var string Path of the XLSX file being read */ protected $filePath; diff --git a/src/Spout/Reader/XLSX/Manager/StyleManager.php b/src/Spout/Reader/XLSX/Manager/StyleManager.php index d5db0d5..71eeead 100644 --- a/src/Spout/Reader/XLSX/Manager/StyleManager.php +++ b/src/Spout/Reader/XLSX/Manager/StyleManager.php @@ -11,20 +11,20 @@ use Box\Spout\Reader\XLSX\Creator\InternalEntityFactory; class StyleManager { /** Nodes used to find relevant information in the styles XML file */ - const XML_NODE_NUM_FMTS = 'numFmts'; - const XML_NODE_NUM_FMT = 'numFmt'; - const XML_NODE_CELL_XFS = 'cellXfs'; - const XML_NODE_XF = 'xf'; + public const XML_NODE_NUM_FMTS = 'numFmts'; + public const XML_NODE_NUM_FMT = 'numFmt'; + public const XML_NODE_CELL_XFS = 'cellXfs'; + public const XML_NODE_XF = 'xf'; /** Attributes used to find relevant information in the styles XML file */ - const XML_ATTRIBUTE_NUM_FMT_ID = 'numFmtId'; - const XML_ATTRIBUTE_FORMAT_CODE = 'formatCode'; - const XML_ATTRIBUTE_APPLY_NUMBER_FORMAT = 'applyNumberFormat'; + public const XML_ATTRIBUTE_NUM_FMT_ID = 'numFmtId'; + public const XML_ATTRIBUTE_FORMAT_CODE = 'formatCode'; + public const XML_ATTRIBUTE_APPLY_NUMBER_FORMAT = 'applyNumberFormat'; /** By convention, default style ID is 0 */ - const DEFAULT_STYLE_ID = 0; + public const DEFAULT_STYLE_ID = 0; - const NUMBER_FORMAT_GENERAL = 'General'; + public const NUMBER_FORMAT_GENERAL = 'General'; /** * @see https://msdn.microsoft.com/en-us/library/ff529597(v=office.12).aspx diff --git a/src/Spout/Reader/XLSX/Manager/WorkbookRelationshipsManager.php b/src/Spout/Reader/XLSX/Manager/WorkbookRelationshipsManager.php index 0a9f6f5..7199f50 100644 --- a/src/Spout/Reader/XLSX/Manager/WorkbookRelationshipsManager.php +++ b/src/Spout/Reader/XLSX/Manager/WorkbookRelationshipsManager.php @@ -12,21 +12,21 @@ use Box\Spout\Reader\XLSX\Creator\InternalEntityFactory; */ class WorkbookRelationshipsManager { - const BASE_PATH = 'xl/'; + public const BASE_PATH = 'xl/'; /** Path of workbook relationships XML file inside the XLSX file */ - const WORKBOOK_RELS_XML_FILE_PATH = 'xl/_rels/workbook.xml.rels'; + public const WORKBOOK_RELS_XML_FILE_PATH = 'xl/_rels/workbook.xml.rels'; /** Relationships types - For Transitional and Strict OOXML */ - const RELATIONSHIP_TYPE_SHARED_STRINGS = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings'; - const RELATIONSHIP_TYPE_STYLES = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles'; - const RELATIONSHIP_TYPE_SHARED_STRINGS_STRICT = 'http://purl.oclc.org/ooxml/officeDocument/relationships/sharedStrings'; - const RELATIONSHIP_TYPE_STYLES_STRICT = 'http://purl.oclc.org/ooxml/officeDocument/relationships/styles'; + public const RELATIONSHIP_TYPE_SHARED_STRINGS = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings'; + public const RELATIONSHIP_TYPE_STYLES = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles'; + public const RELATIONSHIP_TYPE_SHARED_STRINGS_STRICT = 'http://purl.oclc.org/ooxml/officeDocument/relationships/sharedStrings'; + public const RELATIONSHIP_TYPE_STYLES_STRICT = 'http://purl.oclc.org/ooxml/officeDocument/relationships/styles'; /** Nodes and attributes used to find relevant information in the workbook relationships XML file */ - const XML_NODE_RELATIONSHIP = 'Relationship'; - const XML_ATTRIBUTE_TYPE = 'Type'; - const XML_ATTRIBUTE_TARGET = 'Target'; + public const XML_NODE_RELATIONSHIP = 'Relationship'; + public const XML_ATTRIBUTE_TYPE = 'Type'; + public const XML_ATTRIBUTE_TARGET = 'Target'; /** @var string Path of the XLSX file being read */ private $filePath; diff --git a/src/Spout/Reader/XLSX/RowIterator.php b/src/Spout/Reader/XLSX/RowIterator.php index a54b8b1..e9cafdd 100644 --- a/src/Spout/Reader/XLSX/RowIterator.php +++ b/src/Spout/Reader/XLSX/RowIterator.php @@ -21,16 +21,16 @@ use Box\Spout\Reader\XLSX\Helper\CellValueFormatter; class RowIterator implements IteratorInterface { /** Definition of XML nodes names used to parse data */ - const XML_NODE_DIMENSION = 'dimension'; - const XML_NODE_WORKSHEET = 'worksheet'; - const XML_NODE_ROW = 'row'; - const XML_NODE_CELL = 'c'; + public const XML_NODE_DIMENSION = 'dimension'; + public const XML_NODE_WORKSHEET = 'worksheet'; + public const XML_NODE_ROW = 'row'; + public const XML_NODE_CELL = 'c'; /** Definition of XML attributes used to parse data */ - const XML_ATTRIBUTE_REF = 'ref'; - const XML_ATTRIBUTE_SPANS = 'spans'; - const XML_ATTRIBUTE_ROW_INDEX = 'r'; - const XML_ATTRIBUTE_CELL_INDEX = 'r'; + public const XML_ATTRIBUTE_REF = 'ref'; + public const XML_ATTRIBUTE_SPANS = 'spans'; + public const XML_ATTRIBUTE_ROW_INDEX = 'r'; + public const XML_ATTRIBUTE_CELL_INDEX = 'r'; /** @var string Path of the XLSX file being read */ protected $filePath; diff --git a/src/Spout/Writer/CSV/Writer.php b/src/Spout/Writer/CSV/Writer.php index ffa42ba..ffd4f80 100644 --- a/src/Spout/Writer/CSV/Writer.php +++ b/src/Spout/Writer/CSV/Writer.php @@ -15,7 +15,7 @@ use Box\Spout\Writer\WriterAbstract; class Writer extends WriterAbstract { /** Number of rows to write before flushing */ - const FLUSH_THRESHOLD = 500; + public const FLUSH_THRESHOLD = 500; /** @var string Content-Type value for the header */ protected static $headerContentType = 'text/csv; charset=UTF-8'; diff --git a/src/Spout/Writer/Common/Entity/Options.php b/src/Spout/Writer/Common/Entity/Options.php index d7152bb..fbfa709 100644 --- a/src/Spout/Writer/Common/Entity/Options.php +++ b/src/Spout/Writer/Common/Entity/Options.php @@ -9,15 +9,15 @@ namespace Box\Spout\Writer\Common\Entity; abstract class Options { // CSV specific options - const FIELD_DELIMITER = 'fieldDelimiter'; - const FIELD_ENCLOSURE = 'fieldEnclosure'; - const SHOULD_ADD_BOM = 'shouldAddBOM'; + public const FIELD_DELIMITER = 'fieldDelimiter'; + public const FIELD_ENCLOSURE = 'fieldEnclosure'; + public const SHOULD_ADD_BOM = 'shouldAddBOM'; // Multisheets options - const TEMP_FOLDER = 'tempFolder'; - const DEFAULT_ROW_STYLE = 'defaultRowStyle'; - const SHOULD_CREATE_NEW_SHEETS_AUTOMATICALLY = 'shouldCreateNewSheetsAutomatically'; + public const TEMP_FOLDER = 'tempFolder'; + public const DEFAULT_ROW_STYLE = 'defaultRowStyle'; + public const SHOULD_CREATE_NEW_SHEETS_AUTOMATICALLY = 'shouldCreateNewSheetsAutomatically'; // XLSX specific options - const SHOULD_USE_INLINE_STRINGS = 'shouldUseInlineStrings'; + public const SHOULD_USE_INLINE_STRINGS = 'shouldUseInlineStrings'; } diff --git a/src/Spout/Writer/Common/Entity/Sheet.php b/src/Spout/Writer/Common/Entity/Sheet.php index aabdd91..7c786e1 100644 --- a/src/Spout/Writer/Common/Entity/Sheet.php +++ b/src/Spout/Writer/Common/Entity/Sheet.php @@ -10,7 +10,7 @@ use Box\Spout\Writer\Common\Manager\SheetManager; */ class Sheet { - const DEFAULT_SHEET_NAME_PREFIX = 'Sheet'; + public const DEFAULT_SHEET_NAME_PREFIX = 'Sheet'; /** @var int Index of the sheet, based on order in the workbook (zero-based) */ private $index; diff --git a/src/Spout/Writer/Common/Helper/ZipHelper.php b/src/Spout/Writer/Common/Helper/ZipHelper.php index 7a250c8..2f9d955 100644 --- a/src/Spout/Writer/Common/Helper/ZipHelper.php +++ b/src/Spout/Writer/Common/Helper/ZipHelper.php @@ -10,11 +10,11 @@ use Box\Spout\Writer\Common\Creator\InternalEntityFactory; */ class ZipHelper { - const ZIP_EXTENSION = '.zip'; + public const ZIP_EXTENSION = '.zip'; /** Controls what to do when trying to add an existing file */ - const EXISTING_FILES_SKIP = 'skip'; - const EXISTING_FILES_OVERWRITE = 'overwrite'; + public const EXISTING_FILES_SKIP = 'skip'; + public const EXISTING_FILES_OVERWRITE = 'overwrite'; /** @var InternalEntityFactory Factory to create entities */ private $entityFactory; diff --git a/src/Spout/Writer/Common/Manager/SheetManager.php b/src/Spout/Writer/Common/Manager/SheetManager.php index d1d4e6a..ddf136c 100644 --- a/src/Spout/Writer/Common/Manager/SheetManager.php +++ b/src/Spout/Writer/Common/Manager/SheetManager.php @@ -13,7 +13,7 @@ use Box\Spout\Writer\Exception\InvalidSheetNameException; class SheetManager { /** Sheet name should not exceed 31 characters */ - const MAX_LENGTH_SHEET_NAME = 31; + public const MAX_LENGTH_SHEET_NAME = 31; /** @var array Invalid characters that cannot be contained in the sheet name */ private static $INVALID_CHARACTERS_IN_SHEET_NAME = ['\\', '/', '?', '*', ':', '[', ']']; diff --git a/src/Spout/Writer/ODS/Helper/FileSystemHelper.php b/src/Spout/Writer/ODS/Helper/FileSystemHelper.php index 5598bb4..0e593e6 100644 --- a/src/Spout/Writer/ODS/Helper/FileSystemHelper.php +++ b/src/Spout/Writer/ODS/Helper/FileSystemHelper.php @@ -15,17 +15,17 @@ use Box\Spout\Writer\ODS\Manager\WorksheetManager; */ class FileSystemHelper extends \Box\Spout\Common\Helper\FileSystemHelper implements FileSystemWithRootFolderHelperInterface { - const APP_NAME = 'Spout'; - const MIMETYPE = 'application/vnd.oasis.opendocument.spreadsheet'; + public const APP_NAME = 'Spout'; + public const MIMETYPE = 'application/vnd.oasis.opendocument.spreadsheet'; - const META_INF_FOLDER_NAME = 'META-INF'; - const SHEETS_CONTENT_TEMP_FOLDER_NAME = 'worksheets-temp'; + public const META_INF_FOLDER_NAME = 'META-INF'; + public const SHEETS_CONTENT_TEMP_FOLDER_NAME = 'worksheets-temp'; - const MANIFEST_XML_FILE_NAME = 'manifest.xml'; - const CONTENT_XML_FILE_NAME = 'content.xml'; - const META_XML_FILE_NAME = 'meta.xml'; - const MIMETYPE_FILE_NAME = 'mimetype'; - const STYLES_XML_FILE_NAME = 'styles.xml'; + public const MANIFEST_XML_FILE_NAME = 'manifest.xml'; + public const CONTENT_XML_FILE_NAME = 'content.xml'; + public const META_XML_FILE_NAME = 'meta.xml'; + public const MIMETYPE_FILE_NAME = 'mimetype'; + public const STYLES_XML_FILE_NAME = 'styles.xml'; /** @var ZipHelper Helper to perform tasks with Zip archive */ private $zipHelper; diff --git a/src/Spout/Writer/XLSX/Helper/FileSystemHelper.php b/src/Spout/Writer/XLSX/Helper/FileSystemHelper.php index 0a19d9e..4e58a36 100644 --- a/src/Spout/Writer/XLSX/Helper/FileSystemHelper.php +++ b/src/Spout/Writer/XLSX/Helper/FileSystemHelper.php @@ -14,20 +14,20 @@ use Box\Spout\Writer\XLSX\Manager\Style\StyleManager; */ class FileSystemHelper extends \Box\Spout\Common\Helper\FileSystemHelper implements FileSystemWithRootFolderHelperInterface { - const APP_NAME = 'Spout'; + public const APP_NAME = 'Spout'; - const RELS_FOLDER_NAME = '_rels'; - const DOC_PROPS_FOLDER_NAME = 'docProps'; - const XL_FOLDER_NAME = 'xl'; - const WORKSHEETS_FOLDER_NAME = 'worksheets'; + public const RELS_FOLDER_NAME = '_rels'; + public const DOC_PROPS_FOLDER_NAME = 'docProps'; + public const XL_FOLDER_NAME = 'xl'; + public const WORKSHEETS_FOLDER_NAME = 'worksheets'; - const RELS_FILE_NAME = '.rels'; - const APP_XML_FILE_NAME = 'app.xml'; - const CORE_XML_FILE_NAME = 'core.xml'; - const CONTENT_TYPES_XML_FILE_NAME = '[Content_Types].xml'; - const WORKBOOK_XML_FILE_NAME = 'workbook.xml'; - const WORKBOOK_RELS_XML_FILE_NAME = 'workbook.xml.rels'; - const STYLES_XML_FILE_NAME = 'styles.xml'; + public const RELS_FILE_NAME = '.rels'; + public const APP_XML_FILE_NAME = 'app.xml'; + public const CORE_XML_FILE_NAME = 'core.xml'; + public const CONTENT_TYPES_XML_FILE_NAME = '[Content_Types].xml'; + public const WORKBOOK_XML_FILE_NAME = 'workbook.xml'; + public const WORKBOOK_RELS_XML_FILE_NAME = 'workbook.xml.rels'; + public const STYLES_XML_FILE_NAME = 'styles.xml'; /** @var ZipHelper Helper to perform tasks with Zip archive */ private $zipHelper; diff --git a/src/Spout/Writer/XLSX/Manager/OptionsManager.php b/src/Spout/Writer/XLSX/Manager/OptionsManager.php index d3b5cd4..000767f 100644 --- a/src/Spout/Writer/XLSX/Manager/OptionsManager.php +++ b/src/Spout/Writer/XLSX/Manager/OptionsManager.php @@ -13,8 +13,8 @@ use Box\Spout\Writer\Common\Entity\Options; class OptionsManager extends OptionsManagerAbstract { /** Default style font values */ - const DEFAULT_FONT_SIZE = 12; - const DEFAULT_FONT_NAME = 'Calibri'; + public const DEFAULT_FONT_SIZE = 12; + public const DEFAULT_FONT_NAME = 'Calibri'; /** @var StyleBuilder Style builder */ protected $styleBuilder; diff --git a/src/Spout/Writer/XLSX/Manager/SharedStringsManager.php b/src/Spout/Writer/XLSX/Manager/SharedStringsManager.php index b0a5b48..da21f7b 100644 --- a/src/Spout/Writer/XLSX/Manager/SharedStringsManager.php +++ b/src/Spout/Writer/XLSX/Manager/SharedStringsManager.php @@ -11,9 +11,9 @@ use Box\Spout\Common\Helper\Escaper; */ class SharedStringsManager { - const SHARED_STRINGS_FILE_NAME = 'sharedStrings.xml'; + public const SHARED_STRINGS_FILE_NAME = 'sharedStrings.xml'; - const SHARED_STRINGS_XML_FILE_FIRST_PART_HEADER = <<<'EOD' + public const SHARED_STRINGS_XML_FILE_FIRST_PART_HEADER = <<<'EOD' EOD; diff --git a/tests/Spout/Common/Helper/CellTypeHelperTest.php b/tests/Spout/Common/Helper/CellTypeHelperTest.php index b5a4750..701a406 100644 --- a/tests/Spout/Common/Helper/CellTypeHelperTest.php +++ b/tests/Spout/Common/Helper/CellTypeHelperTest.php @@ -10,7 +10,7 @@ use PHPUnit\Framework\TestCase; class CellTypeHelperTest extends TestCase { /** - * @return array + * @return void */ public function testIsEmpty() { @@ -27,7 +27,7 @@ class CellTypeHelperTest extends TestCase } /** - * @return array + * @return void */ public function testIsNonEmptyString() { @@ -44,7 +44,7 @@ class CellTypeHelperTest extends TestCase } /** - * @return array + * @return void */ public function testIsNumeric() { @@ -66,7 +66,7 @@ class CellTypeHelperTest extends TestCase } /** - * @return array + * @return void */ public function testIsBoolean() { diff --git a/tests/Spout/Reader/CSV/SpoutTestStream.php b/tests/Spout/Reader/CSV/SpoutTestStream.php index d66e811..608c2b4 100644 --- a/tests/Spout/Reader/CSV/SpoutTestStream.php +++ b/tests/Spout/Reader/CSV/SpoutTestStream.php @@ -9,10 +9,10 @@ namespace Box\Spout\Reader\CSV; */ class SpoutTestStream { - const CLASS_NAME = __CLASS__; + public const CLASS_NAME = __CLASS__; - const PATH_TO_CSV_RESOURCES = 'tests/resources/csv/'; - const CSV_EXTENSION = '.csv'; + public const PATH_TO_CSV_RESOURCES = 'tests/resources/csv/'; + public const CSV_EXTENSION = '.csv'; /** @var int */ private $position; diff --git a/tests/Spout/Reader/XLSX/Manager/SharedStringsCaching/CachingStrategyFactoryTest.php b/tests/Spout/Reader/XLSX/Manager/SharedStringsCaching/CachingStrategyFactoryTest.php index 807daf7..6216b40 100644 --- a/tests/Spout/Reader/XLSX/Manager/SharedStringsCaching/CachingStrategyFactoryTest.php +++ b/tests/Spout/Reader/XLSX/Manager/SharedStringsCaching/CachingStrategyFactoryTest.php @@ -46,7 +46,7 @@ class CachingStrategyFactoryTest extends TestCase $factoryStub->method('getMemoryLimitInKB')->willReturn($memoryLimitInKB); $tempFolder = sys_get_temp_dir(); - $helperFactory = new HelperFactory($factoryStub); + $helperFactory = new HelperFactory(); $strategy = $factoryStub->createBestCachingStrategy($sharedStringsUniqueCount, $tempFolder, $helperFactory); $fullExpectedStrategyClassName = 'Box\Spout\Reader\XLSX\Manager\SharedStringsCaching\\' . $expectedStrategyClassName; diff --git a/tests/Spout/ReflectionHelper.php b/tests/Spout/ReflectionHelper.php index c078f3b..d958df0 100644 --- a/tests/Spout/ReflectionHelper.php +++ b/tests/Spout/ReflectionHelper.php @@ -62,7 +62,7 @@ class ReflectionHelper // to prevent side-effects in later tests, we need to remember the original value and reset it on tear down // @NOTE: we need to check isset in case the original value was null or array() - if ($saveOriginalValue && (!isset(self::$privateVarsToReset[$class]) || !isset(self::$privateVarsToReset[$class][$name]))) { + if ($saveOriginalValue && (!isset(self::$privateVarsToReset[$class]) || !isset(self::$privateVarsToReset[$class][$valueName]))) { self::$privateVarsToReset[$class][$valueName] = $reflectionProperty->getValue(); } $reflectionProperty->setValue($value); diff --git a/tests/Spout/Writer/ODS/SheetTest.php b/tests/Spout/Writer/ODS/SheetTest.php index 3bd2193..4797406 100644 --- a/tests/Spout/Writer/ODS/SheetTest.php +++ b/tests/Spout/Writer/ODS/SheetTest.php @@ -95,7 +95,7 @@ class SheetTest extends TestCase /** * @param string $fileName * @param string $sheetName - * @return Sheet + * @return void */ private function writeDataAndReturnSheetWithCustomName($fileName, $sheetName) { diff --git a/tests/Spout/Writer/ODS/WriterTest.php b/tests/Spout/Writer/ODS/WriterTest.php index d9295bb..dc86f7c 100644 --- a/tests/Spout/Writer/ODS/WriterTest.php +++ b/tests/Spout/Writer/ODS/WriterTest.php @@ -132,7 +132,7 @@ class WriterTest extends TestCase $writer->addRows($dataRows); $this->fail('Exception should have been thrown'); } catch (SpoutException $e) { - $this->assertFileNotExists($fileName, 'Output file should have been deleted'); + $this->assertFileDoesNotExist($fileName, 'Output file should have been deleted'); $numFiles = iterator_count(new \FilesystemIterator($tempFolderPath, \FilesystemIterator::SKIP_DOTS)); $this->assertEquals(0, $numFiles, 'All temp files should have been deleted'); diff --git a/tests/Spout/Writer/XLSX/WriterTest.php b/tests/Spout/Writer/XLSX/WriterTest.php index 2469506..9f64dc7 100644 --- a/tests/Spout/Writer/XLSX/WriterTest.php +++ b/tests/Spout/Writer/XLSX/WriterTest.php @@ -163,7 +163,7 @@ class WriterTest extends TestCase $writer->addRows($dataRows); $this->fail('Exception should have been thrown'); } catch (SpoutException $e) { - $this->assertFileNotExists($fileName, 'Output file should have been deleted'); + $this->assertFileDoesNotExist($fileName, 'Output file should have been deleted'); $numFiles = iterator_count(new \FilesystemIterator($tempFolderPath, \FilesystemIterator::SKIP_DOTS)); $this->assertEquals(0, $numFiles, 'All temp files should have been deleted');