RetailCRM-Mirror/PHPExcel
1
0
Fork 0
mirror of https://github.com/retailcrm/PHPExcel.git synced 2024-11-29 08:46:03 +03:00
Code Issues Projects Releases Wiki Activity
1,247 Commits 14 Branches 14 Tags 22 MiB
bf2b74b57e
Commit Graph

893 Commits

Author SHA1 Message Date
Progi1984
4d65197b03 Merge branch 'psr2' of https://github.com/PHPOffice/PHPExcel into psr2 2015-05-17 12:12:10 +02:00
Progi1984
6b1764f771 PSR2 Fixes 2015-05-17 12:11:56 +02:00
MarkBaker
b531fd487e Merge branch 'psr2' of https://github.com/PHPOffice/PHPExcel into psr2 2015-05-17 10:23:26 +01:00
MarkBaker
f0fdc9430b More PSR-2 work, and eliminate duplicate code in Row/Column dimensions by extension of an abstract Dimension class containing common code/properties 2015-05-17 10:22:51 +01:00
Progi1984
9140e3da2e PSR2 Fixes 2015-05-17 11:22:28 +02:00
MarkBaker
334747867d Merge branch 'psr2' of https://github.com/PHPOffice/PHPExcel into psr2 
Conflicts:
	Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php
 2015-05-17 00:47:17 +01:00
MarkBaker
1663ef141c More psr-2 changes 2015-05-17 00:16:41 +01:00
MarkBaker
61e81377cb Yet more of the psr-2 work 2015-05-16 23:18:40 +01:00
Progi1984
082fb1b475 PSR2 Fixes 2015-05-16 23:09:31 +02:00
Progi1984
f827a25af2 PSR2 Fixes 2015-05-16 19:00:31 +02:00
Progi1984
1bf5ea414b PSR2 Fixes 2015-05-16 13:04:38 +02:00
MarkBaker
4c8dd00dff More psr-2 goodness 2015-05-15 23:41:50 +01:00
Progi1984
121eccd4c8 PSR-2 : Fixes 2015-05-15 13:36:15 +02:00
Progi1984
5508013569 PSR-2 : Fixes 2015-05-15 13:17:40 +02:00
Progi1984
96f3d0e6ee PSR-2 : Fixes 2015-05-15 12:55:10 +02:00
MarkBaker
e18ba38f16 More psr-2 for charts 2015-05-15 09:11:18 +01:00
MarkBaker
66169af898 PSR-2 coding standards for the charting 2015-05-14 23:50:28 +01:00
MarkBaker
7d9f45c176 Merge branch 'psr2' of https://github.com/PHPOffice/PHPExcel into psr2 
Conflicts:
	Classes/PHPExcel/Calculation.php
	Classes/PHPExcel/Cell.php
 2015-05-13 17:02:34 +01:00
MarkBaker
feac76dadf We changed the coding standard to PSR-2, and wow! What happened next was awesome 2015-05-13 17:00:22 +01:00
Progi1984
141a61a908 PSR-2 : Fixes 2015-05-13 13:36:53 +02:00
Progi1984
7d086fdbee PSR-2 : Fixes 2015-05-13 13:15:55 +02:00
Progi1984
2881bca443 PSR-2 : Fixes 2015-05-13 12:27:01 +02:00
MarkBaker
06c1ea78de PSR-2 goodness 2015-05-13 08:32:01 +01:00
MarkBaker
4a977f1848 Fixed merge errors 2015-05-13 01:29:12 +01:00
MarkBaker
99b0beb721 Merge branch 'psr2' of https://github.com/PHPOffice/PHPExcel into psr2 
Conflicts:
	Classes/PHPExcel/Calculation.php
	Classes/PHPExcel/Shared/CodePage.php
	Classes/PHPExcel/Shared/Date.php
	Classes/PHPExcel/Shared/ZipArchive.php
 2015-05-13 00:45:56 +01:00
MarkBaker
f7296f58b4 More PSR-2 goodness.... getting there slowly 2015-05-13 00:40:55 +01:00
Progi1984
f37630e938 PSR-2 : Fixes 2015-05-12 17:57:29 +02:00
Progi1984
5bb747f8cc PSR-2 : Fixes 2015-05-12 14:01:22 +02:00
Progi1984
661ff77749 Validation PSR-2 : Fixes 2015-05-12 13:17:41 +02:00
Progi1984
95b3fb024a Validation PSR-2 : Fixes 2015-05-12 12:43:52 +02:00
Progi1984
61b5fa0beb Validation PSR-2 : Tabs to spaces 2015-05-12 11:22:06 +02:00
MarkBaker
0d855d0627 More PSR-2 changes 2015-05-12 08:00:59 +01:00
MarkBaker
c70e289dac More efforts to get codebase to conform with PSR-2 coding standards 2015-05-11 22:38:52 +01:00
MarkBaker
547d2bd3b2 More PSR-2 2015-05-11 01:31:26 +01:00
MarkBaker
1efa7e8533 More PSR-2 adjustments 2015-05-10 23:25:04 +01:00
MarkBaker
c07b54172a More PSR-2 modifications 2015-05-09 14:33:20 +01:00
MarkBaker
b8f67c6f4d More PSR-2 changes, and fixes for a couple of breakages introduced by the last commit 2015-05-08 01:09:27 +01:00
MarkBaker
4f8c9bfc96 More PSR-2 work 2015-05-07 01:14:36 +01:00
MarkBaker
3c3154c4a3 PSR-2 variable naming for caching classes, remove leading underscores 2015-05-05 19:40:34 +01:00
MarkBaker
e885ef9196 Fix typo in memcache constructor 2015-05-05 01:37:34 +01:00
MarkBaker
b3d2db79ea Minor case-sensitivity bugfix to getCell when cell reference is a worksheet!cell 
Work on PSR2 Coding standards
 2015-05-04 23:36:20 +01:00
MarkBaker
e83c359c7c Move toward PSR-2 coding standards 2015-05-03 23:37:32 +01:00
MarkBaker
fca778225c Ajust copyright to 2015 2015-05-02 23:50:37 +01:00
MarkBaker
c9cb4d4286 Abstract function PHPExcel_Worksheet_CellIterator::adjustForExistingOnlyRange() cannot contain body 2015-05-01 08:06:07 +01:00
MarkBaker
7ccb90064b Rework of Iterators for existing cells only 2015-04-30 19:07:49 +01:00
MarkBaker
75bb9d7eda Fix regexp for XEE validation 2015-04-29 22:41:54 +01:00
MarkBaker
bc7028ae4e Modified XEE security scan to handle UTF-16 charset, and added unit tests for the security scan 2015-04-29 22:23:14 +01:00
MarkBaker
0ab614fd95 Security: XML filescan in XML-based Readers to prevent XML Entity Expansion (XEE) 
(see http://projects.webappsec.org/w/page/13247002/XML%20Entity%20Expansion for an explanation of XEE injection) attacks
 2015-04-29 00:43:04 +01:00
MarkBaker
d2b0ef2ad9 Pass arguments from Row to RowCellIterator and from Column to ColumnCellIterator 2015-04-26 17:37:48 +01:00
MarkBaker
ceddc13f82 Implement a ColumnIterator, refactoring of RowIterator 
Currently this disables the setIterateOnlyExistingCells option

TODO Re-Implement setIterateOnlyExistingCells logic with the new structure
TODO Rationalise and abstract common methods in the iterator classes
 2015-04-26 13:00:58 +01:00
MarkBaker
f96d9cedba Added RowIterator support for end row, and throws exceptions for invalid arguments 2015-04-25 21:49:30 +01:00
MarkBaker
a287bd44df Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2015-04-16 01:10:04 +01:00
MarkBaker
61f5baac4a GH-543 - Datetime at DefaultValueBinder 
Personally, I don't call it a bug if people pass invalid arguments and it complains with an exception; but I've made some basic changes to support DateTime objects and objects with a __toString() method... Any other objects will throw a catchable fatal error, and it's up to user code to implement any exception handler to convert it to an exception and handle it
 2015-04-16 01:09:29 +01:00
Jared Hall
2736af7994 Update CacheBase.php to prevent fatal error 
When deleteCacheData() is called it will throw a fatal error if the _currentObject is null.
 2015-04-09 14:46:42 -06:00
MarkBaker
caad6b1956 Minor bugfixes for date/time edge cases 2015-03-28 17:45:49 +00:00
MarkBaker
c5a117c82a Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2015-03-26 23:26:04 +00:00
MarkBaker
d44aebc0a4 Improve default value binder handling of string/numeric values 
- Modified regexp to handle scientific notation and apply appropriate tests rather than drop through to string
 - modified handler to detect integers too long for PHP, and treat as string rather than convert to float
 2015-03-26 23:25:24 +00:00
Mark Baker
929add1e36 Merge pull request #512 from andrey-yantsen/patch-1 
Check for variable before using it
 2015-03-19 09:43:11 +00:00
MarkBaker
78c2f23621 Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2015-03-09 23:59:39 +00:00
MarkBaker
d3148bdcdb Minor bugfixes 2015-03-09 23:59:13 +00:00
Pierre Skowron
412a2520cd Set default plotDirection 2015-03-09 14:17:28 +01:00
MarkBaker
a95e3f6607 Bugfix: Remove cells cleanly when calling RemoveRow() or RemoveColumn() 2015-03-04 23:36:38 +00:00
MarkBaker
538fbcd2e8 Additional regexp handling for UTF-8 strings 2015-02-15 00:01:01 +00:00
MarkBaker
518fbc1d36 GH-514 HTML Reader incorrectly converts some UTF-8 string cells to FALSE after regexp space trim 2015-02-14 23:52:57 +00:00
Andrey Yantsen
26e75b1f7a Check for variable before using it 
In some cases $xfrm is empty SimpleXmlElement, so we should check for it before using $xfrm->ext->attributes()
 2015-02-10 09:44:13 +03:00
MarkBaker
31aa953c0b Remove trailing white space from PCLZip 2015-02-04 15:41:59 +00:00
MarkBaker
71dba49fff Improvements to array arithmetic (MMULT) 
Better setup of calculation function tests to ensure consistent environment
 2015-01-23 23:44:32 +00:00
MarkBaker
976e7f064a Excel TRIM function only trims spaces, not tabs or other spacing characters 2015-01-23 16:49:20 +00:00
MarkBaker
fb18b7b598 Fix to complex number format signing when mask has a decimal 2015-01-23 16:09:36 +00:00
MarkBaker
d778b41524 Fix to negative number handling with complex number format masks, so that the sign only appears once 2015-01-23 15:40:54 +00:00
MarkBaker
dc137c293a Method for reversing the case of a string, for use in comparisons where lower-case/upper-case is reversed 2015-01-18 12:31:18 +00:00
MarkBaker
c089cfd53f Modify numeric comparisons in calculation engine to make allowance for floating point imprecision 2015-01-17 22:51:48 +00:00
MarkBaker
98f4754048 GH-496 - Error for superscript handling in HTML to Rich Text helper 2015-01-13 18:47:29 +00:00
MarkBaker
c7da475ef9 Inline styles for HTML not yet implemented 2015-01-12 23:18:46 +00:00
MarkBaker
5e24bcfedc Fix to getCellStyleXfByHashCode() method 2015-01-08 01:23:11 +00:00
MarkBaker
41d970f125 Force uppercase for cell address arguments 2015-01-07 22:36:19 +00:00
MarkBaker
ee309f6e93 Fix initialisation of html to Rich Text helper, and provide additional examples 2014-12-28 19:08:33 +00:00
MarkBaker
0f146e4f31 Feature: Helper to convert basic HTML markup to a Rich Text object 2014-12-27 23:48:24 +00:00
MarkBaker
c40bb233bf Remove spurious file 2014-12-18 21:56:47 +00:00
MarkBaker
180ad168cb Additional minor tweaks to HTML reader for merged cells 2014-12-07 23:45:15 +00:00
MarkBaker
d7ea3e2ab0 Feature: (cifren/MBaker) Work Item GH-205 - Handling merge cells in HTML Reader 2014-12-07 14:45:55 +00:00
MarkBaker
4d67ff7de9 Bugfix: Work Item GH-302 - Fix for CEIL() and FLOOR() when number argument is zero 2014-12-06 17:44:27 +00:00
MarkBaker
741500da14 Add example of cyclic reference calculation 2014-12-06 00:16:41 +00:00
MarkBaker
a4afd4d313 Modify RAND() and RANDBETWEEN() to use mt_rand() 2014-12-06 00:16:09 +00:00
MarkBaker
ab49033479 Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2014-12-06 00:00:18 +00:00
MarkBaker
9daca467d6 Minor modifications to cyclic reference count logic in calculation engine 2014-12-05 23:59:41 +00:00
Mark Baker
51c72f30de Merge pull request #429 from CrandellWS/patch-1 
Fix for substitute value is ZERO=0
 2014-12-05 21:37:16 +00:00
MarkBaker
3f85430e6c Some Excel writer libraries erroneously use Codepage 21010 for UTF-16LE instead of using Codepage 1200 2014-12-05 21:31:17 +00:00
MarkBaker
0296daa75c General: Set default Cyclic Reference behaviour to 1 to eliminate exception when using a single cyclic iteration in formulae 2014-12-03 08:05:25 +00:00
Mark Baker
2d73187b13 Merge pull request #460 from artsafin/develop 
Make PHPExcel_Writer_PDF implement IWriter
 2014-11-27 00:10:07 +00:00
MarkBaker
2be1bb0c2e GH-455 Fix case-sensitivity issue with PHPExcel_Chart_GridLines 2014-11-26 22:53:55 +00:00
MarkBaker
9940b262c4 Remove spurious worksheet created when instantiating the PHPExcel object, and only create sheets defined in the Excel2003XML file 2014-11-26 22:40:49 +00:00
MarkBaker
e7cfdacf95 Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2014-11-26 22:25:36 +00:00
MarkBaker
903f737a39 Bugfix: (bobwitlox) Work Item GH-467 - Bug in Excel2003XML reader, parsing merged cells 2014-11-26 22:24:53 +00:00
Mohd Farhan Firdaus Jamil
793fc2a08f Check for is_object 
Without this , it give php-warning-invalid-argument-supplied-for-foreach error.
 2014-11-16 23:00:45 +08:00
Artur Safin
2338c3caf2 Make PHPExcel_Writer_PDF implement IWriter 2014-11-15 13:00:08 +02:00
Mark Baker
184c1bc290 Merge pull request #446 from wiseloren/develop 
CP21454 "No Impact" conditional formatting fix for NumberFormat
 2014-11-13 00:50:56 +00:00
MarkBaker
5bce69de6f Bugfix: (frozenstupidity) Work Item GH-423 - Fix invalid NA return in VLOOKUP 
Manual merge
 2014-11-12 22:21:47 +00:00
MarkBaker
63de24eeba Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2014-11-11 23:19:05 +00:00
MarkBaker
fdefb8e392 Discard Autofilters in Excel2007 Reader when filter range isn't a valid range 2014-11-11 23:18:13 +00:00