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

Financial functions next stage of refactoring #1943

Merged
merged 19 commits into from
Mar 21, 2021
Merged

Financial functions next stage of refactoring #1943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
82b9f8f
Namespace usage
Mar 21, 2021
eb9f214
Merge branch 'master' into Financial-Functions-next-stage-of-refactoring
Mar 21, 2021
0848bc8
First steps splitting out the Amortization and Deprecation Excel func…
Mar 21, 2021
9bf5b3d
Start refactoring validations
Mar 21, 2021
facf6fb
Verify which methods allow negative values for arguments
Mar 21, 2021
04f9725
Verify which methods allow negative values for arguments
Mar 21, 2021
937971b
Return typehinting for validations
Mar 21, 2021
9dde358
Additional unit tests for SLN() and SYD()
Mar 21, 2021
ca11f93
Additional unit tests for DDB()
Mar 21, 2021
5b36ba9
Additional unit tests for DB()
Mar 21, 2021
ae2a434
Verify cases where salvage is greater than cost
Mar 21, 2021
f5bf166
Remove redundant validation check
Mar 21, 2021
768b946
More unit tests for Amortization
Mar 21, 2021
80adad5
Resolve broken test in AMORLINC() and extract amortizationCoefficient…
Mar 21, 2021
edaf6ea
verify amortizationCoefficient calculation
Mar 21, 2021
458e994
Extract YIELDDISC() and YIELDMAT() to Financial\Securities
Mar 21, 2021
2943a34
Extract validation methods for Securities
Mar 21, 2021
3dc8d97
Aditional validation for Securities Yield functions
Mar 21, 2021
62e23a8
Split Prices and Yields for Securities
Mar 21, 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
18 changes: 9 additions & 9 deletions src/PhpSpreadsheet/Calculation/Calculation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,12 +273,12 @@ class Calculation
],
'AMORDEGRC' => [
'category' => Category::CATEGORY_FINANCIAL,
'functionCall' => [Financial::class, 'AMORDEGRC'],
'functionCall' => [Financial\Amortization::class, 'AMORDEGRC'],
'argumentCount' => '6,7',
],
'AMORLINC' => [
'category' => Category::CATEGORY_FINANCIAL,
'functionCall' => [Financial::class, 'AMORLINC'],
'functionCall' => [Financial\Amortization::class, 'AMORLINC'],
'argumentCount' => '6,7',
],
'AND' => [
Expand Down Expand Up @@ -1983,17 +1983,17 @@ class Calculation
],
'PRICE' => [
'category' => Category::CATEGORY_FINANCIAL,
'functionCall' => [Financial\Securities::class, 'price'],
'functionCall' => [Financial\Securities\Price::class, 'price'],
'argumentCount' => '6,7',
],
'PRICEDISC' => [
'category' => Category::CATEGORY_FINANCIAL,
'functionCall' => [Financial\Securities::class, 'discounted'],
'functionCall' => [Financial\Securities\Price::class, 'priceDiscounted'],
'argumentCount' => '4,5',
],
'PRICEMAT' => [
'category' => Category::CATEGORY_FINANCIAL,
'functionCall' => [Financial\Securities::class, 'maturity'],
'functionCall' => [Financial\Securities\Price::class, 'priceAtMaturity'],
'argumentCount' => '5,6',
],
'PROB' => [
Expand Down Expand Up @@ -2225,7 +2225,7 @@ class Calculation
],
'SLN' => [
'category' => Category::CATEGORY_FINANCIAL,
'functionCall' => [Financial::class, 'SLN'],
'functionCall' => [Financial\Depreciation::class, 'SLN'],
'argumentCount' => '3',
],
'SLOPE' => [
Expand Down Expand Up @@ -2356,7 +2356,7 @@ class Calculation
],
'SYD' => [
'category' => Category::CATEGORY_FINANCIAL,
'functionCall' => [Financial::class, 'SYD'],
'functionCall' => [Financial\Depreciation::class, 'SYD'],
'argumentCount' => '4',
],
'T' => [
Expand Down Expand Up @@ -2641,12 +2641,12 @@ class Calculation
],
'YIELDDISC' => [
'category' => Category::CATEGORY_FINANCIAL,
'functionCall' => [Financial::class, 'YIELDDISC'],
'functionCall' => [Financial\Securities\Yields::class, 'yieldDiscounted'],
'argumentCount' => '4,5',
],
'YIELDMAT' => [
'category' => Category::CATEGORY_FINANCIAL,
'functionCall' => [Financial::class, 'YIELDMAT'],
'functionCall' => [Financial\Securities\Yields::class, 'yieldAtMaturity'],
'argumentCount' => '5,6',
],
'ZTEST' => [
Expand Down
Loading