From 3d299d9938af3cd09d4411db5f02b7da836f3ae8 Mon Sep 17 00:00:00 2001 From: stevleibelt Date: Sun, 17 Jan 2016 21:24:28 +0100 Subject: [PATCH] started unit test fixed error for Spreadsheet_Excel_Writer_Workbook::setVersion() --- Spreadsheet/Excel/Writer/Format.php | 21 ++++++++---- Spreadsheet/Excel/Writer/Parser.php | 33 ++++++++++++------- Spreadsheet/Excel/Writer/Workbook.php | 6 ++-- Spreadsheet/Excel/Writer/Worksheet.php | 4 +-- composer.json | 3 +- phpunit.xml.dist | 17 ++++++++++ .../Test_Spreadsheet_Excel_WriterTestCase.php | 17 ++++++++++ ..._Spreadsheet_Excel_Writer_WorkbookTest.php | 15 +++++++++ test/bootstrap.php | 4 +++ 9 files changed, 95 insertions(+), 25 deletions(-) create mode 100644 phpunit.xml.dist create mode 100644 test/Test/Spreadsheet/Excel/Writer/Test_Spreadsheet_Excel_WriterTestCase.php create mode 100644 test/Test/Spreadsheet/Excel/Writer/Test_Spreadsheet_Excel_Writer_WorkbookTest.php create mode 100644 test/bootstrap.php diff --git a/Spreadsheet/Excel/Writer/Format.php b/Spreadsheet/Excel/Writer/Format.php index a81fc6f..c588a44 100644 --- a/Spreadsheet/Excel/Writer/Format.php +++ b/Spreadsheet/Excel/Writer/Format.php @@ -42,18 +42,24 @@ class Spreadsheet_Excel_Writer_Format extends PEAR { + /** + * The BIFF version for the workbook + * @var integer + */ + public $_BIFF_version; + + /** + * Index to the FONT record. + * @var integer + */ + public $font_index; + /** * The index given by the workbook when creating a new format. * @var integer */ protected $_xf_index; - /** - * Index to the FONT record. - * @var integer - */ - public $font_index; - /** * The font name (ASCII). * @var string @@ -244,6 +250,7 @@ class Spreadsheet_Excel_Writer_Format extends PEAR * Constructor * * @access private + * @param integer $BIFF_version * @param integer $index the XF index for the format. * @param array $properties array with properties to be set on initialization. */ @@ -1096,7 +1103,7 @@ class Spreadsheet_Excel_Writer_Format extends PEAR * Sets the font family name. * * @access public - * @param string $fontfamily The font family name. Possible values are: + * @param string $font_family The font family name. Possible values are: * 'Times New Roman', 'Arial', 'Courier'. */ public function setFontFamily($font_family) diff --git a/Spreadsheet/Excel/Writer/Parser.php b/Spreadsheet/Excel/Writer/Parser.php index fdbb962..7f88811 100644 --- a/Spreadsheet/Excel/Writer/Parser.php +++ b/Spreadsheet/Excel/Writer/Parser.php @@ -107,6 +107,12 @@ define('SPREADSHEET_EXCEL_WRITER_CONCAT', '&'); class Spreadsheet_Excel_Writer_Parser extends PEAR { + /** + * The BIFF version for the workbook + * @var integer + */ + public $_BIFF_version; + /** * The index of the character we are currently looking at * @var integer @@ -125,6 +131,11 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR */ protected $_formula; + /** + * @var array + */ + protected $_functions; + /** * The character ahead of the current char * @var string @@ -155,17 +166,12 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR */ protected $_references; - /** - * The BIFF version for the workbook - * @var integer - */ - protected $_BIFF_version; - /** * The class constructor * * @param integer $byte_order The byte order (Little endian or Big endian) of the architecture - (optional). 1 => big endian, 0 (default) little endian. + * (optional). 1 => big endian, 0 (default) little endian. + * @param integer $biff_version */ public function __construct($byte_order, $biff_version) { @@ -597,6 +603,7 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR * * @access private * @param mixed $num an integer or double for conversion to its ptg value + * @return string */ protected function _convertNumber($num) { @@ -660,11 +667,13 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR } /** - * Convert an Excel range such as A1:D4 to a ptgRefV. - * - * @access private - * @param string $range An Excel range in the A1:A2 or A1..A2 format. - */ + * Convert an Excel range such as A1:D4 to a ptgRefV. + * + * @access private + * @param string $range An Excel range in the A1:A2 or A1..A2 format. + * @param int $class + * @return array|string + */ protected function _convertRange2d($range, $class=0) { diff --git a/Spreadsheet/Excel/Writer/Workbook.php b/Spreadsheet/Excel/Writer/Workbook.php index 3e46846..de1b0d8 100644 --- a/Spreadsheet/Excel/Writer/Workbook.php +++ b/Spreadsheet/Excel/Writer/Workbook.php @@ -55,7 +55,7 @@ class Spreadsheet_Excel_Writer_Workbook extends Spreadsheet_Excel_Writer_BIFFwri /** * Formula parser - * @var object Parser + * @var Spreadsheet_Excel_Writer_Parser */ protected $parser; @@ -111,7 +111,7 @@ class Spreadsheet_Excel_Writer_Workbook extends Spreadsheet_Excel_Writer_BIFFwri /** * The default XF format. - * @var object Format + * @var Spreadsheet_Excel_Writer_Format */ protected $temporaryFormat; @@ -141,7 +141,7 @@ class Spreadsheet_Excel_Writer_Workbook extends Spreadsheet_Excel_Writer_BIFFwri /** * The default format for URLs. - * @var object Format + * @var Spreadsheet_Excel_Writer_Format */ protected $urlFormat; diff --git a/Spreadsheet/Excel/Writer/Worksheet.php b/Spreadsheet/Excel/Writer/Worksheet.php index cfa76b0..5a5aea2 100644 --- a/Spreadsheet/Excel/Writer/Worksheet.php +++ b/Spreadsheet/Excel/Writer/Worksheet.php @@ -59,13 +59,13 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr /** * Reference to the (default) Format object for URLs - * @var object Format + * @var Spreadsheet_Excel_Writer_Format */ protected $_url_format; /** * Reference to the parser used for parsing formulas - * @var object Format + * @var Spreadsheet_Excel_Writer_Format */ protected $_parser; diff --git a/composer.json b/composer.json index d7299c0..2887d5f 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,8 @@ ], "autoload": { "psr-0": { - "Spreadsheet": "./" + "Spreadsheet": "./", + "Test": "./test" } }, "description": "More info available on: http://pear.php.net/package/Spreadsheet_Excel_Writer", diff --git a/phpunit.xml.dist b/phpunit.xml.dist new file mode 100644 index 0000000..13323cf --- /dev/null +++ b/phpunit.xml.dist @@ -0,0 +1,17 @@ + + + + + test/ + + + diff --git a/test/Test/Spreadsheet/Excel/Writer/Test_Spreadsheet_Excel_WriterTestCase.php b/test/Test/Spreadsheet/Excel/Writer/Test_Spreadsheet_Excel_WriterTestCase.php new file mode 100644 index 0000000..69d6623 --- /dev/null +++ b/test/Test/Spreadsheet/Excel/Writer/Test_Spreadsheet_Excel_WriterTestCase.php @@ -0,0 +1,17 @@ + + * @since 2016-01-17 + */ +class Test_Spreadsheet_Excel_WriterTestCase extends PHPUnit_Framework_TestCase +{ + /** + * @param string $fileName + * @return Spreadsheet_Excel_Writer_Workbook + */ + protected function getNewWorkbook($fileName = 'my_workbook') + { + return new Spreadsheet_Excel_Writer_Workbook($fileName); + } +} \ No newline at end of file diff --git a/test/Test/Spreadsheet/Excel/Writer/Test_Spreadsheet_Excel_Writer_WorkbookTest.php b/test/Test/Spreadsheet/Excel/Writer/Test_Spreadsheet_Excel_Writer_WorkbookTest.php new file mode 100644 index 0000000..e96a5df --- /dev/null +++ b/test/Test/Spreadsheet/Excel/Writer/Test_Spreadsheet_Excel_Writer_WorkbookTest.php @@ -0,0 +1,15 @@ + + * @since 2016-01-17 + */ +class Test_Spreadsheet_Excel_Writer_WorkbookTest extends Test_Spreadsheet_Excel_WriterTestCase +{ + public function testSetVersion() + { + $workbook = $this->getNewWorkbook(); + + $workbook->setVersion(8); + } +} \ No newline at end of file diff --git a/test/bootstrap.php b/test/bootstrap.php new file mode 100644 index 0000000..0ddc4c5 --- /dev/null +++ b/test/bootstrap.php @@ -0,0 +1,4 @@ +