Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Problems Using Builtin PHP Functions Directly As Excel Functions #1799

Merged
merged 41 commits into from
Jan 26, 2021
+1,482 −28
Merged

Problems Using Builtin PHP Functions Directly As Excel Functions #1799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
52f3005
Make DefinedNames Samples Consistent With Other Samples (#1707)
oleibman Nov 11, 2020
e05442b
Resolve XSS Vulnerability in the HTML Writer (#1719)
Nov 19, 2020
5596d6d
Drop Travis
PowerKiKi Nov 26, 2020
d75bba4
Automatic GitHub releases from git tags
PowerKiKi Nov 26, 2020
e4be949
Improve Coverage in src/PhpSpreadsheet
oleibman Nov 27, 2020
39025e8
Changes for Scrutinizer
oleibman Nov 27, 2020
6e71f80
Spelling: Tou -> You
rhynodesigns Dec 7, 2020
95cb746
Fix for 1735 (Incorrect activeSheetIndex after RemoveSheetByIndex) (#…
oleibman Dec 10, 2020
37ec4fa
Update change log
Dec 10, 2020
7b8f023
Fix for 3 Issues Involving ReadXlsx and NamedRange (#1742)
oleibman Dec 10, 2020
acd5a75
Update change log
Dec 10, 2020
cf30b88
Apply Column and Row Styles to Existing Cells (#1721)
oleibman Dec 10, 2020
ebae8ef
Update change log
Dec 10, 2020
2cbe2fd
TextData Coverage and Minor Bug Fixes (#1744)
oleibman Dec 10, 2020
a4bd396
Replace anti-xss with html purifier (#1751)
Dec 10, 2020
dfc0ff4
Fix bug #1626 where values of 0 were "rounded" up/down as if they wer…
Flinsch Dec 10, 2020
0ad58e6
Update change log
Dec 10, 2020
201817c
Fix for #1612 - SLK Long File Name (#1706)
oleibman Dec 10, 2020
5079aac
Update change log
Dec 10, 2020
6e56c2c
worksheet: fix if cellValue does not exist (#1727)
jasverix Dec 10, 2020
be3b30b
fixes #1655 issue (#1656)
kalyabin Dec 10, 2020
fe45f08
Add 'ps' suffix to printer settings resources IDs (#1690)
sdespont Dec 10, 2020
b2b1f25
Update change log
Dec 10, 2020
64a22e0
Fix pixelsToPoints conversion (for HTML col width) (#1733)
guilliamxavier Dec 10, 2020
f011d1f
DocBlock Change in Styles/Conditional (#1697)
oleibman Dec 10, 2020
c1a63d7
Merge pull request #1698
oleibman Dec 17, 2020
65b8625
Fix for bug #1592 (UPDATED) (#1623)
ggiovinazzo Dec 17, 2020
09b9771
Update change log
Dec 17, 2020
99e023f
Add nightly PHP 8.1 dev to github actions (#1763)
Dec 21, 2020
a70c1eb
Fix compatibility with ext-gd on php 8 (#1762)
derrabus Dec 25, 2020
b691443
CSV - Guess Encoding, Handle Null-string Escape (#1717)
oleibman Dec 25, 2020
a46032b
Update changelog
Dec 25, 2020
bad8647
Update Units of Measure supported by the CONVERT() function (#1768)
Dec 29, 2020
3998509
Changelog for 1.16.0 release
Dec 31, 2020
c6074ab
Fix date tests withut specified year for current year 2021 (#1774)
martinssipenko Jan 7, 2021
298dd1e
Mrand of zero to any multiple should return 0 (#1773)
martinssipenko Jan 7, 2021
e51ea11
Merge pull request #6 from PHPOffice/master
oleibman Jan 18, 2021
18257a9
Problems Using Builtin PHP Functions Directly As Excel Functions
oleibman Jan 18, 2021
072f498
Scrutinizer Recommendations
oleibman Jan 18, 2021
699fd38
Improved Handling of Tan(PI/2)
oleibman Jan 19, 2021
dc580f2
Additional Trig Tests
oleibman Jan 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions src/PhpSpreadsheet/Calculation/Calculation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ class Calculation
private static $phpSpreadsheetFunctions = [
'ABS' => [
'category' => Category::CATEGORY_MATH_AND_TRIG,
'functionCall' => 'abs',
'functionCall' => [MathTrig::class, 'builtinABS'],
'argumentCount' => '1',
],
'ACCRINT' => [
Expand All @@ -243,12 +243,12 @@ class Calculation
],
'ACOS' => [
'category' => Category::CATEGORY_MATH_AND_TRIG,
'functionCall' => 'acos',
'functionCall' => [MathTrig::class, 'builtinACOS'],
'argumentCount' => '1',
],
'ACOSH' => [
'category' => Category::CATEGORY_MATH_AND_TRIG,
'functionCall' => 'acosh',
'functionCall' => [MathTrig::class, 'builtinACOSH'],
'argumentCount' => '1',
],
'ACOT' => [
Expand Down Expand Up @@ -303,17 +303,17 @@ class Calculation
],
'ASIN' => [
'category' => Category::CATEGORY_MATH_AND_TRIG,
'functionCall' => 'asin',
'functionCall' => [MathTrig::class, 'builtinASIN'],
'argumentCount' => '1',
],
'ASINH' => [
'category' => Category::CATEGORY_MATH_AND_TRIG,
'functionCall' => 'asinh',
'functionCall' => [MathTrig::class, 'builtinASINH'],
'argumentCount' => '1',
],
'ATAN' => [
'category' => Category::CATEGORY_MATH_AND_TRIG,
'functionCall' => 'atan',
'functionCall' => [MathTrig::class, 'builtinATAN'],
'argumentCount' => '1',
],
'ATAN2' => [
Expand All @@ -323,7 +323,7 @@ class Calculation
],
'ATANH' => [
'category' => Category::CATEGORY_MATH_AND_TRIG,
'functionCall' => 'atanh',
'functionCall' => [MathTrig::class, 'builtinATANH'],
'argumentCount' => '1',
],
'AVEDEV' => [
Expand Down Expand Up @@ -604,12 +604,12 @@ class Calculation
],
'COS' => [
'category' => Category::CATEGORY_MATH_AND_TRIG,
'functionCall' => 'cos',
'functionCall' => [MathTrig::class, 'builtinCOS'],
'argumentCount' => '1',
],
'COSH' => [
'category' => Category::CATEGORY_MATH_AND_TRIG,
'functionCall' => 'cosh',
'functionCall' => [MathTrig::class, 'builtinCOSH'],
'argumentCount' => '1',
],
'COT' => [
Expand Down Expand Up @@ -834,7 +834,7 @@ class Calculation
],
'DEGREES' => [
'category' => Category::CATEGORY_MATH_AND_TRIG,
'functionCall' => 'rad2deg',
'functionCall' => [MathTrig::class, 'builtinDEGREES'],
'argumentCount' => '1',
],
'DELTA' => [
Expand Down Expand Up @@ -974,7 +974,7 @@ class Calculation
],
'EXP' => [
'category' => Category::CATEGORY_MATH_AND_TRIG,
'functionCall' => 'exp',
'functionCall' => [MathTrig::class, 'builtinEXP'],
'argumentCount' => '1',
],
'EXPONDIST' => [
Expand Down Expand Up @@ -1565,7 +1565,7 @@ class Calculation
],
'LN' => [
'category' => Category::CATEGORY_MATH_AND_TRIG,
'functionCall' => 'log',
'functionCall' => [MathTrig::class, 'builtinLN'],
'argumentCount' => '1',
],
'LOG' => [
Expand All @@ -1575,7 +1575,7 @@ class Calculation
],
'LOG10' => [
'category' => Category::CATEGORY_MATH_AND_TRIG,
'functionCall' => 'log10',
'functionCall' => [MathTrig::class, 'builtinLOG10'],
'argumentCount' => '1',
],
'LOGEST' => [
Expand Down Expand Up @@ -2037,7 +2037,7 @@ class Calculation
],
'RADIANS' => [
'category' => Category::CATEGORY_MATH_AND_TRIG,
'functionCall' => 'deg2rad',
'functionCall' => [MathTrig::class, 'builtinRADIANS'],
'argumentCount' => '1',
],
'RAND' => [
Expand Down Expand Up @@ -2092,7 +2092,7 @@ class Calculation
],
'REPT' => [
'category' => Category::CATEGORY_TEXT_AND_DATA,
'functionCall' => 'str_repeat',
'functionCall' => [TextData::class, 'builtinREPT'],
'argumentCount' => '2',
],
'RIGHT' => [
Expand All @@ -2112,7 +2112,7 @@ class Calculation
],
'ROUND' => [
'category' => Category::CATEGORY_MATH_AND_TRIG,
'functionCall' => 'round',
'functionCall' => [MathTrig::class, 'builtinROUND'],
'argumentCount' => '2',
],
'ROUNDDOWN' => [
Expand Down Expand Up @@ -2203,12 +2203,12 @@ class Calculation
],
'SIN' => [
'category' => Category::CATEGORY_MATH_AND_TRIG,
'functionCall' => 'sin',
'functionCall' => [MathTrig::class, 'builtinSIN'],
'argumentCount' => '1',
],
'SINH' => [
'category' => Category::CATEGORY_MATH_AND_TRIG,
'functionCall' => 'sinh',
'functionCall' => [MathTrig::class, 'builtinSINH'],
'argumentCount' => '1',
],
'SKEW' => [
Expand Down Expand Up @@ -2248,7 +2248,7 @@ class Calculation
],
'SQRT' => [
'category' => Category::CATEGORY_MATH_AND_TRIG,
'functionCall' => 'sqrt',
'functionCall' => [MathTrig::class, 'builtinSQRT'],
'argumentCount' => '1',
],
'SQRTPI' => [
Expand Down Expand Up @@ -2364,12 +2364,12 @@ class Calculation
],
'TAN' => [
'category' => Category::CATEGORY_MATH_AND_TRIG,
'functionCall' => 'tan',
'functionCall' => [MathTrig::class, 'builtinTAN'],
'argumentCount' => '1',
],
'TANH' => [
'category' => Category::CATEGORY_MATH_AND_TRIG,
'functionCall' => 'tanh',
'functionCall' => [MathTrig::class, 'builtinTANH'],
'argumentCount' => '1',
],
'TBILLEQ' => [
Expand Down
Loading