Commit Graph

384 Commits

Author SHA1 Message Date
Сергей Симонян
1a2a6816fb
Fix undefined index exceprtion in readRow()
It's possible undefined index exception in $this->mapCellXfIndex.
2016-09-09 00:42:24 +09:00
Marcus Bointon
39ea4eea98 Don't truncate to 64k in mb_str_replace 2016-09-05 23:23:49 +02:00
MarkBaker
fb2edfdacf Merge branch 'develop' of https://github.com/PHPOffice/PhpSpreadsheet into develop
# Conflicts:
#	src/Autoloader.php
2016-08-31 21:58:08 +01:00
MarkBaker
fae27a6d63 As iconv is now enabled by default in PHP, make it a requirement, and modify strig functions to use it where appropriate 2016-08-31 21:52:42 +01:00
Adrien Crivelli
47cde0dadc
Introduce vendor prefix PhpOffice to namespace 2016-09-01 02:20:47 +09:00
Adrien Crivelli
2922a13764
Reorganize code samples
This introduce a helper class that should be used to log things,
avoiding a lot of boilerplate code.

Also all output are made in /tmp folder instead of beside the script
itself. This is because there is a high chance that the folder containing
the script is not writtable by webserver. So using the /tmp folder
makes it more likely to works in a variety of setup.
2016-09-01 01:17:13 +09:00
Adrien Crivelli
c3bb4245b3
Register autoload as the first in the list
Yii framework v1.1 has it's own autoloader and its autoloader throws
an error, when it can't find class. When this library initializes, it
register its own autoloader, but places it at the end of autoload
queue. So when I use library with Yii 1.1, I just face an error:
`include(PHPExcel_Shared_String.php): failed to open stream: No such file or directory`
because Yii's autoloader runs first and tries to include class file
directly.

Registering our autoloader first avoid this.
2016-08-30 00:51:51 +09:00
Nikolay Ivanov
98e00e8843
iconv illegal character fix 2016-08-26 22:52:47 +09:00
Adrien Crivelli
67d5263004
Fix code style 2016-08-26 22:48:57 +09:00
Synchro
c50814ac4e
Remove unused local var, function returns void anyway 2016-08-26 22:44:55 +09:00
Synchro
30e0451bc3
Fix duplicate array keys in ptg indices
Reference: http://read.pudn.com/downloads173/sourcecode/delphi_control/805790/DevExpress/DevExpressComm/cxExcelConst.pas__.htm
2016-08-26 22:41:14 +09:00
Synchro
16a8162a14
Fix duplicate array key 2016-08-26 22:32:55 +09:00
Carlos Montiers
6acd403251
In memory gzip cache method use max compression 2016-08-26 22:09:46 +09:00
Carlos Montiers
d8850176a1
php://temp maxmemory must be expressed in bytes 2016-08-26 22:07:49 +09:00
Adrien Crivelli
91417ad1c3
Delete debug and commented out code 2016-08-26 18:08:26 +09:00
Adrien Crivelli
04d6182a81
Remove unused variables 2016-08-26 15:05:40 +09:00
Adrien Crivelli
b42bafcfe7
Apply Scrutinizer patches for doc comments 2016-08-26 13:40:01 +09:00
Adrien Crivelli
cb0930c016
Apply Scrutinizer patches for indentation 2016-08-25 19:35:29 +09:00
Adrien Crivelli
a85f1bdbed
Apply Scrutinizer patches for spacing 2016-08-25 18:46:02 +09:00
Adrien Crivelli
027792ed09
Fix wrong class names that were incorrectly migrated 2016-08-25 13:39:26 +09:00
Adrien Crivelli
942ad72d2a
Complete a few more namespace renaming 2016-08-25 11:43:27 +09:00
Adrien Crivelli
ba70544846
Fix crash when reading HTML files 2016-08-25 11:14:03 +09:00
Adrien Crivelli
7a6c5b0d1b
Fix code style 2016-08-25 11:13:49 +09:00
MarkBaker
e0a9f9e1ec Merge branch 'feature/gh-7' into develop
# Conflicts:
#	src/PhpSpreadsheet/Shared/Date.php
2016-08-17 00:40:55 +01:00
MarkBaker
f8c3363de3 Fix some Case-sensitivity problems 2016-08-17 00:36:24 +01:00
Adrien Crivelli
09d456e477
Introduce PHP-CS-Fixer for stricter code style rules
PHP-CS-Fixer allow to check different things than phpcs and it allows
code to be more consistent. Configuration can be changed in `.php_cs`
2016-08-17 00:33:57 +09:00
Adrien Crivelli
539a89a918
Rename namespace PHPExcel to PhpSpreadsheet
This also fix a few bugs that were introduced when migrating to
namespace. Some non-namespaces classes were leftover

FIX #15
2016-08-16 23:24:47 +09:00
Adrien Crivelli
a6c6064348
Replace mentions of CodePlex by GitHub 2016-08-16 22:02:03 +09:00
MarkBaker
91573b5c93 Split PHPToExcel logic for different input types 2016-08-14 22:36:30 +01:00
MarkBaker
aa97bb3e45 Merge branch 'develop' into feature/gh-7
# Conflicts:
#	tests/PhpSpreadsheet/Shared/DateTest.php
2016-08-14 15:41:50 +01:00
MarkBaker
f0e167c182 Unit tests for modified Date functions 2016-08-14 15:35:43 +01:00
Adrien Crivelli
ce2ce3414b
Refactor arguments with default values to be at the end of the argument list 2016-08-14 14:09:55 +09:00
Adrien Crivelli
ea513d9c1b
Autofix style code with phpcs 2016-08-14 13:55:34 +09:00
MarkBaker
850594c4d2 Merge branch 'develop' into feature/gh-7
# Conflicts:
#	tests/PhpSpreadsheet/Shared/DateTest.php
#	tests/rawTestData/Shared/DateTimeExcelToPHP1900.data
#	tests/rawTestData/Shared/DateTimeExcelToPHP1900Timezone.data
#	tests/rawTestData/Shared/DateTimeExcelToPHP1904.data
#	unitTests/rawTestData/Shared/DateTimeExcelToPHP1900.data
#	unitTests/rawTestData/Shared/DateTimeExcelToPHP1904.data
#	unitTests/rawTestData/Shared/DateTimeExcelToTimestamp1900.data
#	unitTests/rawTestData/Shared/DateTimeExcelToTimestamp1904.data
2016-08-14 02:07:10 +01:00
MarkBaker
e149c1f191 Adjustments to DateTime tests 2016-08-13 20:21:45 +01:00
MarkBaker
fd2df82faf Merge branch 'develop' into feature/gh-17 2016-08-13 16:59:03 +01:00
Adrien Crivelli
80af21d962
Fix unit tests for date
Unit tests were broken in commit 745499cc55
2016-08-14 00:31:09 +09:00
Adrien Crivelli
49d821f093
Autofix style code with phpcs
The entire project now pass phpcs check
2016-08-13 23:31:22 +09:00
MarkBaker
8569f04090 Fixes to ZipArchive cass when PCLZip being used
Fixes to default arguments when typehinted arguments in Chart writer are null values
Fix to gitignore for Examples folder/subfolders
2016-08-13 14:52:49 +01:00
MarkBaker
2da06e5b03 Another copy/paste error that has somehow sneaked into the date code 2016-08-13 13:38:10 +01:00
MarkBaker
558da2269d Fix a couple of errors that have sneaked into the date code, plus some minor problems in radar/scatter chart examples, and a spurious html comment that had sneaked into spreadsheet 2016-08-13 13:28:29 +01:00
MarkBaker
3886999957 Merge branch 'develop' of https://github.com/PHPOffice/PhpSpreadsheet into develop 2016-08-13 11:50:02 +01:00
MarkBaker
745499cc55 Changes to Date/Time conversion functions to use DateTime objects internally rather than unix timestamps;
Changes to Date/Time methods to make them more intuitive and correct (eg `excelToTimestamp` rather than `excelToPHP`)
TODO - Still need to write unit tests, and convert Examples to use the new names
2016-08-13 11:49:01 +01:00
Mark Baker
9ecfc0c8b4 Merge pull request #10 from PowerKiKi/unit-tests-bessel
Fix unit tests for BESSEL functions
2016-08-13 11:40:19 +01:00
Mark Baker
98ccf97e55 Merge pull request #12 from PowerKiKi/unit-tests-base-conversion
Fix unit tests for all base conversion functions
2016-08-13 11:40:02 +01:00
MarkBaker
30bb53ebf8 Double call of PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::stringFromColumnIndex(0)) resulting in `PHP Warning: A non-numeric value encountered" 2016-08-05 00:22:19 +01:00
Adrien Crivelli
8fc29bd1b1
Fix unit tests for all base conversion functions
This include cases were artificial constraints were not checked
(eg: between -512 and 511 for `DECBIN`) and some bugs were 32
bits platform were assumed.

The following are covered:

`BIN2DEC`, `BIN2HEX`, `BIN2OCT`,
`DEC2BIN`, `DEC2HEX`, `DEC2OCT`,
`HEX2BIN`, `HEX2DEC`, `HEX2OCT`,
`OCT2BIN`, `OCT2DEC`, `OCT2HEX`
2016-08-01 02:48:51 +09:00
Adrien Crivelli
3a38cc8f0a
Fix unit tests for BESSEL functions
Expected data were re-written by using LibreOffice 5 as a reference.
We kept only 8 decimals, because this is the precision used in tests,
and it's easier to read without scientific notation.

Also a few expected values were wrong so they were changed. The correct
expected values were confirmed by both LibreOffice 5 and wolframalpha.com.

Finally fixed an actual bug in code were a NaN value were returned instead of
the correct `#NUM!`.
2016-07-31 23:11:54 +09:00
MarkBaker
2291748a83 Fix for multiple worksheets, all with merge cells, in HTML Writer 2016-07-14 23:09:19 +01:00
MarkBaker
1702d95333 Fix for XML settings, together with unit tests 2016-06-05 17:03:42 +01:00
Progi1984
36a9068b38 #401 : PHPUnit Fixes (Calculation > LookupRef) 2016-05-20 08:41:09 +02:00
Progi1984
6faed3bd58 #463 : Patch @domic-olga vlookup - incorrect value when not exact match 2016-05-19 14:38:50 +02:00
Progi1984
20d007abb1 #401 : PHPUnit Fixes (Calculation > Engineering) 2016-05-19 12:49:15 +02:00
Progi1984
248bdbf841 #401 : PHPUnit Fixes (Calculation > Engineering) 2016-05-19 12:31:40 +02:00
Progi1984
14c9fac305 Merge pull request #900 from ValentinNikolaev/patch-2
Fix: replace String with StringHelper in Font
2016-05-19 08:50:49 +02:00
Progi1984
98f7d4bf08 #401 : PHPUnit Fixes (Calculation > DateTime) 2016-05-19 08:49:09 +02:00
Valentin I. Nikolaev
5e4e6fe3ee Fix: replace String with StringHelper in Font
We use StringHelper::countCharacters, not String::countCharacters
2016-05-19 05:33:22 +03:00
Progi1984
104d8362ec #401 : PHPCS Fixes & Some PHPUnit Fixes 2016-05-18 13:51:56 +02:00
Progi1984
259ce457f3 #401 : PHPCS Fixes & Some PHPUnit Fixes 2016-05-18 13:37:00 +02:00
Progi1984
dffeb25a5f #401 : PHPCS Fixes 2016-05-18 09:02:39 +02:00
Progi1984
05643d16d5 #401 : PHPCS (Calculation\MathTrig & Logical) 2016-05-14 18:22:59 +02:00
Progi1984
12590bbf1e #401 : PHPCS (Calculation\Functions) 2016-05-14 10:29:38 +02:00
Progi1984
69e168271a #401 : PHPCS (Shared\StringHelper) 2016-05-14 09:51:58 +02:00
Progi1984
c0fe7c275d #401 : Fix for JpGraph 2016-05-14 09:43:02 +02:00
Progi1984
3942965fc4 #401 : Fix for JpGraph 2016-05-14 09:40:29 +02:00
Progi1984
ee4cb020f1 #401 : Fix for TcPDF & MPDF 2016-05-13 22:25:10 +02:00
Progi1984
984bf1f7de #401 : Fix for MPDF 2016-05-13 22:23:48 +02:00
Progi1984
0521be04fa #401 : Fix for TcPDF 2016-05-13 22:23:11 +02:00
Progi1984
2fed2de62d #401 : Fix for PHPCS 2016-05-13 22:06:18 +02:00
MarkBaker
3bb541c610 GH-879 Bug in file PHPExcel/Reader/CSV.php
Code logic identifying a defined separator when no separator is explicitly defined
Case-insensitive check when separator is explicitly defined
2016-04-14 23:20:07 +01:00
MarkBaker
343955453a General: (sim642) Pull Request 489 - Implement actual timezone adjustment into PHPExcel_Shared_Date::PHPToExcel 2016-03-31 23:50:57 +01:00
MarkBaker
18a45ee7a1 Bugfix: (vitalyrepin) Pull Request 869 - c:max and c:min elements shall NOT be inside c:orientation elements 2016-03-31 23:26:45 +01:00
Progi1984
727ab1ef34 #401 : Support for namespaces 2016-03-22 22:40:11 +01:00
Progi1984
c5b352169c #401 : Support for namespaces 2016-03-22 22:20:22 +01:00
Progi1984
8d9221e711 #401 : Support for namespaces 2016-03-22 16:56:25 +01:00
Progi1984
2e396b7416 #401 : Support for namespaces 2016-03-22 16:56:11 +01:00
Progi1984
7562cc8757 #401 : Support for namespaces 2016-03-22 16:56:04 +01:00
Progi1984
d0d018b661 #401 : Support for namespaces 2016-03-22 16:55:55 +01:00
Progi1984
27925954fb #401 : Support for namespaces 2016-03-22 16:55:47 +01:00
Progi1984
2c245ab725 #401 : Support for namespaces 2016-03-22 16:55:37 +01:00
Progi1984
dc3e96091a #401 : Support for namespaces 2016-03-22 16:55:24 +01:00
Progi1984
c866be3c7a #401 : Support for namespaces 2016-03-22 16:44:56 +01:00
Progi1984
f546be620e #401 : Support for namespaces 2016-03-22 16:26:31 +01:00
Progi1984
86bfdcba15 Merge remote-tracking branch 'origin/1.9' into 1.9 2016-03-22 16:11:20 +01:00
Progi1984
54ae9901f5 #401 : Support for namespaces 2016-03-22 16:11:05 +01:00
MarkBaker
fcaf73e77f Merge branch '1.9' of https://github.com/PHPOffice/PHPExcel into 1.9 2016-03-22 14:50:28 +00:00
Progi1984
95e6c5e264 #401 : Support for namespaces 2016-03-22 15:35:50 +01:00
Progi1984
73ac0aee35 Fix some errors with samples 2016-03-22 15:19:00 +01:00
MarkBaker
710ab744db General: (rentalhost) Work Item GH-575 - Excel 2007 Reader freezes because of conditional formatting 2016-03-22 13:36:24 +00:00
Progi1984
6e222bbdde Fix some errors with samples 2016-03-22 14:25:49 +01:00
Progi1984
114fc00763 Fix some PHPCS errors 2016-03-22 10:08:48 +01:00
Progi1984
03f053bf77 Fix PHPCS Error 2016-03-18 11:18:31 +01:00
MarkBaker
2e0e9b2398 Detect the presence of a sep=; line in CSV imports, and set the delimiter accordingly 2016-03-17 23:05:14 +00:00
MarkBaker
b9ae7d1873 Allow inclusion of a sep=; line when creating csv files 2016-03-17 23:04:34 +00:00
MarkBaker
ee73d559b9 Fix missing ; in last commit 2016-03-07 07:58:41 +00:00
MarkBaker
0c3a5c2e40 Allow formatted strings as argument in PHPToExcel date conversion 2016-03-06 23:27:33 +00:00
MarkBaker
4a67f086a1 Feature: (Tomino2112) Work Item GH-808 - MemoryDrawing not working in HTML writer
Manual merge of Pull Request
2016-03-01 23:16:13 +00:00
MarkBaker
fa98c373df Allow HYPERLINK() function to set the tooltip, and add extra examples of setting hyperlinks either through PHPExcel methods or using the HYPERLINK() function 2016-03-01 12:33:50 +00:00
MarkBaker
6db66a0da4 Docblock fix 2016-02-29 09:33:09 +00:00
MarkBaker
141d64d6a2 Minor bugfixes and documentation changes 2016-01-13 22:38:34 +00:00
MarkBaker
189a5c439e Refactor mappers out from Excel5 Reader completely 2016-01-01 18:21:24 +00:00
MarkBaker
70a557346e Refactor colour mapping for Excel5 Reader 2015-12-30 02:18:30 +00:00
MarkBaker
6518b75796 Start work on implementing an option to ignore "empty" cells when reading a file 2015-12-30 00:24:48 +00:00
MarkBaker
28d3b97d0d Missing Reader/Writer abstracts 2015-12-29 00:00:12 +00:00
MarkBaker
1926c652db Modify getCell() methods to allow creating a new cell if the selected cell doesn't exist as an option 2015-12-28 23:59:09 +00:00
MarkBaker
0025318d7e Minor tweaks 2015-12-06 16:08:37 +00:00
MarkBaker
6dc0c1f1b6 Additional codepages 2015-11-09 23:33:26 +00:00
MarkBaker
84011f8d57 Initial implementation of SUMIFS() function 2015-11-09 21:39:35 +00:00
MarkBaker
bb7b48d94c Fix to MEDIAN() function 2015-10-28 00:47:15 +00:00
MarkBaker
26cf4c0709 Remove savedPrecision from Calculation Engine 2015-10-15 23:07:36 +01:00
MarkBaker
0985caf352 Fix for problem with xlsx files overriding the reserved number format codes below 164 with custom codes 2015-10-14 23:24:34 +01:00
MarkBaker
450e1672f0 Fix to allow calculate formula against a workbook, without passing in a cell 2015-09-17 23:57:01 +01:00
MarkBaker
be9f22cc34 Fix to HTML margins 2015-09-14 23:05:02 +01:00
MarkBaker
818413ebe0 We shouldn't override any of the built-in MS Excel values (values below id 164)
But there's a lot of naughty homebrew xlsx writers that do use "reserved" id values that aren't actually used
So we make allowance for them rather than lose formatting masks
2015-08-14 19:50:49 +01:00
MarkBaker
8af8d3b460 Fix to HTML generation with charts that fall outside of the main data area, and fix to show trailing / in folders for the jpgraph in examples 2015-08-03 19:50:34 +01:00
MarkBaker
21f5db0ca5 Additional work on number format masks 2015-08-03 00:33:46 +01:00
MarkBaker
7c0208bd26 Handle some discrepancies between the ECMA standard and actual internal number formats used by MS Excel 2015-08-02 00:40:42 +01:00
MarkBaker
d7ef6810a4 Improved masking for number format handling, particularly for datetime masks 2015-08-01 00:39:10 +01:00
MarkBaker
f968a95ca5 Bugfix: Work Item GH-554 - Whitespace after toRichTextObject() 2015-07-15 23:23:20 +01:00
MarkBaker
67dee17d67 Initial namespacing for Excel2007 and Excel5 Writers 2015-07-08 23:31:58 +01:00
Frans Saris
daf2482dd6 [TASK] Namespaced /Writer/ Classes 2015-07-01 13:26:15 +02:00
MarkBaker
ed087dd396 More namespacing work 2015-06-03 08:21:50 +01:00
MarkBaker
f1e8ec1f4d Finish namespacing the Readers 2015-06-03 00:10:08 +01:00
MarkBaker
0d956534eb Another large chunk of namespacing work 2015-06-02 00:07:00 +01:00
MarkBaker
c86a72ac1a Another chunk of namespacing work 2015-06-01 21:08:48 +01:00
MarkBaker
ebca5d1a57 Start work on namespacing Reader classes 2015-05-31 23:24:19 +01:00
MarkBaker
a39e15f49d Fix a couple of errors introduced with the last namespace changes 2015-05-30 16:54:51 +01:00
MarkBaker
621fc9aec7 namespacing in calculation functions 2015-05-30 15:56:59 +01:00
MarkBaker
ee04f30d67 Another block of work on namespacing 2015-05-30 14:06:37 +01:00
MarkBaker
54d2f72a0a More namespacing work 2015-05-30 12:25:17 +01:00
MarkBaker
0dafaea059 Work on rewriting unit tests for the new folder structure (calling bootstrap) and json input files 2015-05-29 21:35:35 +01:00
MarkBaker
53584ec9a3 Unit tests for Cell classes, modification to use json-format in raw data provider 2015-05-28 08:29:44 +01:00
MarkBaker
fe51b5e4fa Update style classes for namespacing 2015-05-27 23:16:28 +01:00
MarkBaker
85118eb030 Changes to folder structures to bring PHPExcel in line with other PHPOffice projects
Additional namespacing work on PHPExcel core
2015-05-26 21:21:05 +01:00