Skip to content

Commit 4337de4

Browse files
committed
Rename Excel5 into Xls
FIX #4
1 parent 39b55de commit 4337de4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+199
-197
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
3838
|---------------------------------|-------------------------------------------|
3939
| `PHPExcel` | `PhpOffice\PhpSpreadsheet\Spreadsheet` |
4040
| `PHPExcel_Reader_Excel2007` | `PhpOffice\PhpSpreadsheet\Reader\Xlsx` |
41+
| `PHPExcel_Reader_Excel5` | `PhpOffice\PhpSpreadsheet\Reader\Xls` |
4142
| `PHPExcel_Writer_Excel2007` | `PhpOffice\PhpSpreadsheet\Writer\Xlsx` |
43+
| `PHPExcel_Writer_Excel5` | `PhpOffice\PhpSpreadsheet\Writer\Xls` |
4244

4345
- Some methods were renamed for clarity and/or consistency:
4446

Documentation/Examples/Reader/exampleReader03.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
include 'PHPExcel/IOFactory.php';
2727

2828

29-
$inputFileType = 'Excel5';
29+
$inputFileType = 'Xls';
3030
// $inputFileType = 'Xlsx';
3131
// $inputFileType = 'Excel2003XML';
3232
// $inputFileType = 'OOCalc';

Documentation/Examples/Reader/exampleReader05.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
include 'PHPExcel/IOFactory.php';
2727

2828

29-
$inputFileType = 'Excel5';
29+
$inputFileType = 'Xls';
3030
// $inputFileType = 'Xlsx';
3131
// $inputFileType = 'Excel2003XML';
3232
// $inputFileType = 'OOCalc';

Documentation/Examples/Reader/exampleReader06.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
include 'PHPExcel/IOFactory.php';
2727

2828

29-
$inputFileType = 'Excel5';
29+
$inputFileType = 'Xls';
3030
// $inputFileType = 'Xlsx';
3131
// $inputFileType = 'Excel2003XML';
3232
// $inputFileType = 'OOCalc';

Documentation/Examples/Reader/exampleReader07.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
include 'PHPExcel/IOFactory.php';
2727

2828

29-
$inputFileType = 'Excel5';
29+
$inputFileType = 'Xls';
3030
// $inputFileType = 'Xlsx';
3131
// $inputFileType = 'Excel2003XML';
3232
// $inputFileType = 'OOCalc';

Documentation/Examples/Reader/exampleReader08.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
include 'PHPExcel/IOFactory.php';
2727

2828

29-
$inputFileType = 'Excel5';
29+
$inputFileType = 'Xls';
3030
// $inputFileType = 'Xlsx';
3131
// $inputFileType = 'Excel2003XML';
3232
// $inputFileType = 'OOCalc';

Documentation/Examples/Reader/exampleReader09.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
include 'PHPExcel/IOFactory.php';
2727

2828

29-
$inputFileType = 'Excel5';
29+
$inputFileType = 'Xls';
3030
// $inputFileType = 'Xlsx';
3131
// $inputFileType = 'Excel2003XML';
3232
// $inputFileType = 'OOCalc';

Documentation/Examples/Reader/exampleReader10.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
include 'PHPExcel/IOFactory.php';
2727

2828

29-
$inputFileType = 'Excel5';
29+
$inputFileType = 'Xls';
3030
// $inputFileType = 'Xlsx';
3131
// $inputFileType = 'Excel2003XML';
3232
// $inputFileType = 'OOCalc';

Documentation/Examples/Reader/exampleReader11.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
include 'PHPExcel/IOFactory.php';
2727

2828

29-
$inputFileType = 'Excel5';
29+
$inputFileType = 'Xls';
3030
// $inputFileType = 'Xlsx';
3131
// $inputFileType = 'Excel2003XML';
3232
// $inputFileType = 'OOCalc';

Documentation/Examples/Reader/exampleReader12.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
include 'PHPExcel/IOFactory.php';
2727

2828

29-
$inputFileType = 'Excel5';
29+
$inputFileType = 'Xls';
3030
// $inputFileType = 'Xlsx';
3131
// $inputFileType = 'Excel2003XML';
3232
// $inputFileType = 'OOCalc';

Documentation/Examples/Reader/exampleReader17.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
include 'PHPExcel/IOFactory.php';
2727

2828

29-
$inputFileType = 'Excel5';
29+
$inputFileType = 'Xls';
3030
// $inputFileType = 'Xlsx';
3131
// $inputFileType = 'Excel2003XML';
3232
// $inputFileType = 'OOCalc';

Documentation/Examples/Reader/exampleReader18.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
include 'PHPExcel/IOFactory.php';
2727

2828

29-
$inputFileType = 'Excel5';
29+
$inputFileType = 'Xls';
3030
// $inputFileType = 'Xlsx';
3131
// $inputFileType = 'Excel2003XML';
3232
// $inputFileType = 'OOCalc';

Documentation/Examples/Reader/exampleReader19.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
include 'PHPExcel/IOFactory.php';
2727

2828

29-
$inputFileType = 'Excel5';
29+
$inputFileType = 'Xls';
3030
// $inputFileType = 'Xlsx';
3131
// $inputFileType = 'Excel2003XML';
3232
// $inputFileType = 'OOCalc';

Documentation/Examples/Reading WorkBook Data/exampleWorkBookReader01.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
include 'PHPExcel/IOFactory.php';
2727

2828

29-
$inputFileType = 'Excel5';
29+
$inputFileType = 'Xls';
3030
$inputFileName = './sampleData/example1.xls';
3131

3232
/** Create a new Reader of the type defined in $inputFileType **/

Documentation/Examples/Reading WorkBook Data/exampleWorkBookReader04.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
include 'PHPExcel/IOFactory.php';
2727

2828

29-
$inputFileType = 'Excel5';
29+
$inputFileType = 'Xls';
3030
$inputFileName = './sampleData/example2.xls';
3131

3232
/** Create a new Reader of the type defined in $inputFileType **/

Documentation/markdown/CalculationEngine/FunctionReference/02-General-Introduction.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
## General Introduction
44

5-
### Function that are not Supported in Excel5
5+
### Function that are not Supported in Xls
66

7-
Not all functions are supported by the Excel 5 Writer. Use of these functions within your workbooks will result in an error when trying to write to Excel5.
7+
Not all functions are supported by the Excel 5 Writer. Use of these functions within your workbooks will result in an error when trying to write to Xls.
88

99
The following is the list of those functions that are implemented within PHPExcel, but that cannot currently be written to Excel 5.
1010

Documentation/markdown/CalculationEngine/FunctionReference/03-03-Date-and-Time-Functions.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ DATEVALUE uses the php date/time object implementation of strtotime() (which can
299299

300300
__WARNING:-__ PHPExcel accepts a wider range of date formats than MS Excel, so it is entirely possible that Excel will return a #VALUE! error when passed a date string that it can’t interpret, while PHPExcel is able to translate that same string into a correct date value.
301301

302-
Care should be taken in workbooks that use string formatted dates in calculations when writing to Excel5 or Xlsx.
302+
Care should be taken in workbooks that use string formatted dates in calculations when writing to Xls or Xlsx.
303303

304304
#### DAY
305305

@@ -435,7 +435,7 @@ $retVal = call_user_func_array(
435435

436436
##### Notes
437437

438-
__WARNING:-__ This function does not currently work with the Excel5 Writer when a PHP Boolean is used for the third (optional) parameter (as shown in the example above), and the writer will generate and error. It will work if a numeric 0 or 1 is used for the method parameter; or if the Excel TRUE() and FALSE() functions are used instead.
438+
__WARNING:-__ This function does not currently work with the Xls Writer when a PHP Boolean is used for the third (optional) parameter (as shown in the example above), and the writer will generate and error. It will work if a numeric 0 or 1 is used for the method parameter; or if the Excel TRUE() and FALSE() functions are used instead.
439439

440440
#### EDATE
441441

@@ -498,7 +498,7 @@ $retVal = call_user_func_array(
498498

499499
###### Notes
500500

501-
__WARNING:-__ This function is currently not supported by the Excel5 Writer because it is not a standard function within Excel 5, but an add-in from the Analysis ToolPak.
501+
__WARNING:-__ This function is currently not supported by the Xls Writer because it is not a standard function within Excel 5, but an add-in from the Analysis ToolPak.
502502

503503
#### EOMONTH
504504

@@ -559,7 +559,7 @@ $retVal = call_user_func_array(
559559

560560
##### Notes
561561

562-
__WARNING:-__ This function is currently not supported by the Excel5 Writer because it is not a standard function within Excel 5, but an add-in from the Analysis ToolPak.
562+
__WARNING:-__ This function is currently not supported by the Xls Writer because it is not a standard function within Excel 5, but an add-in from the Analysis ToolPak.
563563

564564
#### HOUR
565565

Documentation/markdown/Overview/01-Getting-Started.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ $objPHPExcel->getActiveSheet()->getProtection()->setSheet(true);
116116

117117
Not all features of PHPExcel are implemented in all of the Reader / Writer classes. This is mostly due to underlying libraries not supporting a specific feature or not having implemented a specific feature.
118118

119-
For example autofilter is not implemented in PEAR Spreadsheet_Excel_writer, which is the base of our Excel5 writer.
119+
For example autofilter is not implemented in PEAR Spreadsheet_Excel_writer, which is the base of our Xls writer.
120120

121121
We are slowly building up a list of features, together with the different readers and writers that support them, in the "Functionality Cross-Reference.xls" file in the /Documentation folder.
122122

Documentation/markdown/Overview/07-Accessing-Cells.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ $objPHPExcel->getActiveSheet()->getStyle('A10')
127127
![07-simple-example-1.png](./images/07-simple-example-1.png "")
128128

129129

130-
**Note** that not all complex format masks such as this one will work when retrieving a formatted value to display "on screen", or for certain writers such as HTML or PDF, but it will work with the true spreadsheet writers (Xlsx and Excel5).
130+
**Note** that not all complex format masks such as this one will work when retrieving a formatted value to display "on screen", or for certain writers such as HTML or PDF, but it will work with the true spreadsheet writers (Xlsx and Xls).
131131

132132
### Setting a range of cells from an array
133133

Documentation/markdown/Overview/08-Recipes.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,7 @@ $objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Xlsx');
10821082
$objWriter->save('php://output');
10831083
```
10841084

1085-
Example of a script redirecting an Excel5 file to the client's browser:
1085+
Example of a script redirecting an Xls file to the client's browser:
10861086

10871087
```php
10881088
/* Here there will be some code where you create $objPHPExcel */
@@ -1092,7 +1092,7 @@ header('Content-Type: application/vnd.ms-excel');
10921092
header('Content-Disposition: attachment;filename="myfile.xls"');
10931093
header('Cache-Control: max-age=0');
10941094

1095-
$objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5');
1095+
$objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Xls');
10961096
$objWriter->save('php://output');
10971097
```
10981098

Documentation/markdown/Overview/10-Reading-and-Writing.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ Office2003 compatibility option should only be used when needed. This option dis
144144

145145
### Excel 5 (BIFF) file format
146146

147-
Excel5 file format is the old Excel file format, implemented in PHPExcel to provide a uniform manner to create both .xlsx and .xls files. It is basically a modified version of [PEAR Spreadsheet_Excel_Writer][21], although it has been extended and has fewer limitations and more features than the old PEAR library. This can read all BIFF versions that use OLE2: BIFF5 (introduced with office 95) through BIFF8, but cannot read earlier versions.
147+
Xls file format is the old Excel file format, implemented in PHPExcel to provide a uniform manner to create both .xlsx and .xls files. It is basically a modified version of [PEAR Spreadsheet_Excel_Writer][21], although it has been extended and has fewer limitations and more features than the old PEAR library. This can read all BIFF versions that use OLE2: BIFF5 (introduced with office 95) through BIFF8, but cannot read earlier versions.
148148

149-
Excel5 file format will not be developed any further, it just provides an additional file format for PHPExcel.
149+
Xls file format will not be developed any further, it just provides an additional file format for PHPExcel.
150150

151151
__Excel5 (BIFF) limitations__
152152
Please note that BIFF file format has some limits regarding to styling cells and handling large spreadsheets via PHP.
@@ -704,7 +704,7 @@ $objWorksheet = $objPHPexcel->getActiveSheet();
704704
$objWorksheet->getCell('A1')->setValue('John');
705705
$objWorksheet->getCell('A2')->setValue('Smith');
706706
707-
$objWriter = PHPExcel_IOFactory::createWriter($objPHPexcel, 'Excel5');
707+
$objWriter = PHPExcel_IOFactory::createWriter($objPHPexcel, 'Xls');
708708
$objWriter->save('write.xls');
709709
```
710710

Documentation/markdown/ReadingSpreadsheetFiles/01-File-Formats.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ PHPExcel can read a number of different spreadsheet and file formats, although n
77

88
Currently, PHPExcel supports the following File Types for Reading:
99

10-
### Excel5
10+
### Xls
1111

1212
The Microsoft Excel™ Binary file format (BIFF5 and BIFF8) is a binary file format that was used by Microsoft Excel™ between versions 95 and 2003. The format is supported (to various extents) by most spreadsheet programs. BIFF files normally have an extension of .xls. Documentation describing the format can be found online at [http://msdn.microsoft.com/en-us/library/cc313154(v=office.12).aspx][1] or from [http://download.microsoft.com/download/2/4/8/24862317-78F0-4C4B-B355-C7B2C1D997DB/[MS-XLS].pdf][2] (as a downloadable PDF).
1313

Documentation/markdown/ReadingSpreadsheetFiles/03-Loading-a-Spreadsheet.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $objPHPExcel = PHPExcel_IOFactory::load($inputFileName);
1515
1616
The load() method will attempt to identify the file type, and instantiate a loader for that file type; using it to load the file and store the data and any formatting in a PHPExcel object.
1717

18-
The method makes an initial guess at the loader to instantiate based on the file extension; but will test the file before actually executing the load: so if (for example) the file is actually a CSV file or contains HTML markup, but that has been given a .xls extension (quite a common practise), it will reject the Excel5 loader that it would normally use for a .xls file; and test the file using the other loaders until it finds the appropriate loader, and then use that to read the file.
18+
The method makes an initial guess at the loader to instantiate based on the file extension; but will test the file before actually executing the load: so if (for example) the file is actually a CSV file or contains HTML markup, but that has been given a .xls extension (quite a common practise), it will reject the Xls loader that it would normally use for a .xls file; and test the file using the other loaders until it finds the appropriate loader, and then use that to read the file.
1919

2020
While easy to implement in your code, and you don't need to worry about the file type; this isn't the most efficient method to load a file; and it lacks the flexibility to configure the loader in any way before actually reading the file into a PHPExcel object.
2121

Documentation/markdown/ReadingSpreadsheetFiles/04-Loading-with-a-Reader.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ If you know the file type of the spreadsheet file that you need to load, you can
88
```php
99
$inputFileName = './sampleData/example1.xls';
1010

11-
/** Create a new Excel5 Reader **/
11+
/** Create a new Xls Reader **/
1212
$objReader = new PHPExcel_Reader_Excel5();
1313
// $objReader = new PHPExcel_Reader_Excel2007();
1414
// $objReader = new PHPExcel_Reader_Excel2003XML();
@@ -24,7 +24,7 @@ $objPHPExcel = $objReader->load($inputFileName);
2424
Alternatively, you can use the IO Factory's createReader() method to instantiate the reader object for you, simply telling it the file type of the reader that you want instantiating.
2525

2626
```php
27-
$inputFileType = 'Excel5';
27+
$inputFileType = 'Xls';
2828
// $inputFileType = 'Xlsx';
2929
// $inputFileType = 'Excel2003XML';
3030
// $inputFileType = 'OOCalc';

0 commit comments

Comments
 (0)