From 3e6a419b6d3cf0a0f5b0d42c02717ca021a11d88 Mon Sep 17 00:00:00 2001 From: Adrien Crivelli Date: Sat, 21 Oct 2017 23:25:44 +0900 Subject: [PATCH] Remove useless `@static` annotations --- src/PhpSpreadsheet/IOFactory.php | 18 ------------------ src/PhpSpreadsheet/Shared/OLE.php | 6 ------ src/PhpSpreadsheet/Writer/Xls/Font.php | 2 +- src/PhpSpreadsheet/Writer/Xls/Xf.php | 8 ++++---- src/PhpSpreadsheet/Writer/Xlsx/Theme.php | 6 +++--- 5 files changed, 8 insertions(+), 32 deletions(-) diff --git a/src/PhpSpreadsheet/IOFactory.php b/src/PhpSpreadsheet/IOFactory.php index 941e1892..858cfa47 100644 --- a/src/PhpSpreadsheet/IOFactory.php +++ b/src/PhpSpreadsheet/IOFactory.php @@ -10,7 +10,6 @@ class IOFactory * Search locations. * * @var array - * @static */ private static $searchLocations = [ ['type' => 'IWriter', 'path' => 'PhpSpreadsheet/Writer/{0}.php', 'class' => '\\PhpOffice\\PhpSpreadsheet\\Writer\\{0}'], @@ -21,7 +20,6 @@ class IOFactory * Autoresolve classes. * * @var array - * @static */ private static $autoResolveClasses = [ 'Xlsx', @@ -44,8 +42,6 @@ class IOFactory /** * Get search locations. * - * @static - * * @return array */ public static function getSearchLocations() @@ -56,8 +52,6 @@ class IOFactory /** * Set search locations. * - * @static - * * @param array $value * * @throws Reader\Exception @@ -70,8 +64,6 @@ class IOFactory /** * Add search location. * - * @static - * * @param string $type Example: IWriter * @param string $location Example: PhpSpreadsheet/Writer/{0}.php * @param string $classname Example: Writer\{0} @@ -84,8 +76,6 @@ class IOFactory /** * Create Writer\IWriter. * - * @static - * * @param Spreadsheet $spreadsheet * @param string $writerType Example: Xlsx * @@ -126,8 +116,6 @@ class IOFactory /** * Create Reader\IReader. * - * @static - * * @param string $readerType Example: Xlsx * * @throws Reader\Exception @@ -158,8 +146,6 @@ class IOFactory /** * Loads Spreadsheet from file using automatic Reader\IReader resolution. * - * @static - * * @param string $pFilename The name of the spreadsheet file * * @throws Reader\Exception @@ -176,8 +162,6 @@ class IOFactory /** * Identify file type using automatic Reader\IReader resolution. * - * @static - * * @param string $pFilename The name of the spreadsheet file to identify * * @throws Reader\Exception @@ -197,8 +181,6 @@ class IOFactory /** * Create Reader\IReader for file using automatic Reader\IReader resolution. * - * @static - * * @param string $pFilename The name of the spreadsheet file * * @throws Reader\Exception diff --git a/src/PhpSpreadsheet/Shared/OLE.php b/src/PhpSpreadsheet/Shared/OLE.php index 7bbd8543..4912b388 100644 --- a/src/PhpSpreadsheet/Shared/OLE.php +++ b/src/PhpSpreadsheet/Shared/OLE.php @@ -472,8 +472,6 @@ class OLE /** * Utility function to transform ASCII text to Unicode. * - * @static - * * @param string $ascii The ASCII string to transform * * @return string The string in Unicode @@ -493,8 +491,6 @@ class OLE * Utility function * Returns a string for the OLE container with the date given. * - * @static - * * @param int $date A timestamp * * @return string The string for the OLE container @@ -539,8 +535,6 @@ class OLE /** * Returns a timestamp from an OLE container's date. * - * @static - * * @param int $string A binary string with the encoded date * * @return string The timestamp corresponding to the string diff --git a/src/PhpSpreadsheet/Writer/Xls/Font.php b/src/PhpSpreadsheet/Writer/Xls/Font.php index ac2a3ed3..45a029f6 100644 --- a/src/PhpSpreadsheet/Writer/Xls/Font.php +++ b/src/PhpSpreadsheet/Writer/Xls/Font.php @@ -121,7 +121,7 @@ class Font /** * Map of BIFF2-BIFF8 codes for underline styles. * - * @static array of int + * @var array of int */ private static $mapUnderline = [ \PhpOffice\PhpSpreadsheet\Style\Font::UNDERLINE_NONE => 0x00, diff --git a/src/PhpSpreadsheet/Writer/Xls/Xf.php b/src/PhpSpreadsheet/Writer/Xls/Xf.php index 619ae733..ed957a03 100644 --- a/src/PhpSpreadsheet/Writer/Xls/Xf.php +++ b/src/PhpSpreadsheet/Writer/Xls/Xf.php @@ -347,7 +347,7 @@ class Xf /** * Map of BIFF2-BIFF8 codes for border styles. * - * @static array of int + * @var array of int */ private static $mapBorderStyles = [ Border::BORDER_NONE => 0x00, @@ -385,7 +385,7 @@ class Xf /** * Map of BIFF2-BIFF8 codes for fill types. * - * @static array of int + * @var array of int */ private static $mapFillTypes = [ Fill::FILL_NONE => 0x00, @@ -430,7 +430,7 @@ class Xf /** * Map of BIFF2-BIFF8 codes for horizontal alignment. * - * @static array of int + * @var array of int */ private static $mapHAlignments = [ Alignment::HORIZONTAL_GENERAL => 0, @@ -461,7 +461,7 @@ class Xf /** * Map of BIFF2-BIFF8 codes for vertical alignment. * - * @static array of int + * @var array of int */ private static $mapVAlignments = [ Alignment::VERTICAL_TOP => 0, diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Theme.php b/src/PhpSpreadsheet/Writer/Xlsx/Theme.php index 9f1a946f..8bd8f131 100644 --- a/src/PhpSpreadsheet/Writer/Xlsx/Theme.php +++ b/src/PhpSpreadsheet/Writer/Xlsx/Theme.php @@ -15,7 +15,7 @@ class Theme extends WriterPart /** * Map of Major fonts to write. * - * @static array of string + * @var array of string */ private static $majorFonts = [ 'Jpan' => 'MS Pゴシック', @@ -53,7 +53,7 @@ class Theme extends WriterPart /** * Map of Minor fonts to write. * - * @static array of string + * @var array of string */ private static $minorFonts = [ 'Jpan' => 'MS Pゴシック', @@ -91,7 +91,7 @@ class Theme extends WriterPart /** * Map of core colours. * - * @static array of string + * @var array of string */ private static $colourScheme = [ 'dk2' => '1F497D',