@@ -143,7 +143,7 @@ |
||
143 | 143 | } |
144 | 144 | |
145 | 145 | /** |
146 | - * @return mixed |
|
146 | + * @return string |
|
147 | 147 | */ |
148 | 148 | public function getAnnuityPeriodLengthInDays() { |
149 | 149 | return $this->annuityPeriodLength->toDays(); |
@@ -60,9 +60,9 @@ |
||
60 | 60 | * @param $annuityInterest |
61 | 61 | */ |
62 | 62 | function __construct($annuitySinglePaymentAmount, |
63 | - $annuityNoOfCompoundingPeriods, |
|
64 | - TimeSpan $annuityPeriodLength, |
|
65 | - $annuityInterest) { |
|
63 | + $annuityNoOfCompoundingPeriods, |
|
64 | + TimeSpan $annuityPeriodLength, |
|
65 | + $annuityInterest) { |
|
66 | 66 | $this->setAnnuitySinglePaymentAmount($annuitySinglePaymentAmount); |
67 | 67 | $this->setAnnuityNoOfCompoundingPeriods($annuityNoOfCompoundingPeriods); |
68 | 68 | $this->setAnnuityPeriodLength($annuityPeriodLength); |
@@ -73,7 +73,7 @@ |
||
73 | 73 | } |
74 | 74 | |
75 | 75 | /** |
76 | - * @return float |
|
76 | + * @return string |
|
77 | 77 | */ |
78 | 78 | public function getBondFairValue() { |
79 | 79 | // we need to get the coupon rate per payment period = c/payment frequency |
@@ -47,10 +47,10 @@ |
||
47 | 47 | * @param $bondPaymentFrequency |
48 | 48 | */ |
49 | 49 | function __construct($bondFaceValue, |
50 | - $bondAnnualCouponRate, |
|
51 | - $bondVIR, |
|
52 | - $bondYearsToMaturity, |
|
53 | - $bondPaymentFrequency = 1) { |
|
50 | + $bondAnnualCouponRate, |
|
51 | + $bondVIR, |
|
52 | + $bondYearsToMaturity, |
|
53 | + $bondPaymentFrequency = 1) { |
|
54 | 54 | $this->setBondFaceValue($bondFaceValue); |
55 | 55 | $this->setBondAnnualCouponRate($bondAnnualCouponRate); |
56 | 56 | $this->setBondVIR($bondVIR); |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | { |
13 | 13 | /** |
14 | 14 | * @param $expectedTypeName [Name of the expected class as a string] |
15 | - * @param $foundTypeName [Name of the class that was used instead] |
|
15 | + * @param string $foundTypeName [Name of the class that was used instead] |
|
16 | 16 | * @return string [Concatenated message as a string] |
17 | 17 | */ |
18 | 18 | static function getIncompatibleTypesMessage($expectedTypeName, $foundTypeName) { |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | |
64 | 64 | /** |
65 | 65 | * @param $propertyName [Name of the property as a string] |
66 | - * @param $className [Name of the class as a string] |
|
66 | + * @param string $className [Name of the class as a string] |
|
67 | 67 | * @return string [Concatenated message as a string] |
68 | 68 | */ |
69 | 69 | static function getNonExistentPropertyMessage($propertyName, $className) { |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | |
104 | 104 | /** |
105 | 105 | * @param $factoryClassName [Name of the factory class as a string] |
106 | - * @param $factoryClassAncestorName [Name of the factory class' expected parent class name as a string] |
|
106 | + * @param string $factoryClassAncestorName [Name of the factory class' expected parent class name as a string] |
|
107 | 107 | * @return string [Concatenated message as a string] |
108 | 108 | */ |
109 | 109 | static function getFactoryClassExpectedAncestorMessage($factoryClassName, $factoryClassAncestorName) { |
@@ -163,8 +163,8 @@ discard block |
||
163 | 163 | } |
164 | 164 | |
165 | 165 | /** |
166 | - * @param $methodName [Name of the method] |
|
167 | - * @param $className [Name of the class] |
|
166 | + * @param string $methodName [Name of the method] |
|
167 | + * @param string $className [Name of the class] |
|
168 | 168 | * @return string [Concatenated message as a string] |
169 | 169 | */ |
170 | 170 | static function getMethodDoesNotExistMessage($methodName, $className) { |
@@ -32,7 +32,6 @@ |
||
32 | 32 | use FinanCalc\Constants\ErrorMessages; |
33 | 33 | use FinanCalc\Interfaces\Calculator\CalculatorFactoryAbstract; |
34 | 34 | use FinanCalc\Utils\Config; |
35 | - use FinanCalc\Calculators\Factories; |
|
36 | 35 | use ReflectionClass; |
37 | 36 | use ReflectionException; |
38 | 37 |
@@ -1,32 +1,32 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * FinanCalc |
|
4 | - * |
|
5 | - * A lightweight, simple and easy PHP library for calculating annuities (e.g., mortgages) |
|
6 | - * and other financial instruments according to various input data |
|
7 | - * |
|
8 | - * |
|
9 | - * DISCLAIMER |
|
10 | - * You are free to use/modify/extend the library as you please - for it to serve your purpose. |
|
11 | - * As per the (un)license, the software is provided as is and the original author cannot be held liable |
|
12 | - * for any losses/damages directly or indirectly resulting from using thereof. |
|
13 | - * Attribution is welcome, but certainly not required. |
|
14 | - * |
|
15 | - * NOTE |
|
16 | - * The library is currently work-in-progress and it is certain that new features will be added in the process. |
|
17 | - * Consider this, therefore, as a preview product prone to abrupt and extensive changes that may affect functionality |
|
18 | - * of an external code adapted to a prior version(s) of the library. |
|
19 | - * Always explore the provisional compatibility of the library with your project in case you upgrade to a new version |
|
20 | - * of the library (by means of an extensive testing of the code in which you are exerting the library's features). |
|
21 | - * |
|
22 | - * PREREQUISITES |
|
23 | - * PHP 5.5+ |
|
24 | - * Module php-bcmath |
|
25 | - * |
|
26 | - * @author Václav Uruba |
|
27 | - * @version 0.3 |
|
28 | - * @license http://unlicense.org The Unlicense |
|
29 | - */ |
|
3 | + * FinanCalc |
|
4 | + * |
|
5 | + * A lightweight, simple and easy PHP library for calculating annuities (e.g., mortgages) |
|
6 | + * and other financial instruments according to various input data |
|
7 | + * |
|
8 | + * |
|
9 | + * DISCLAIMER |
|
10 | + * You are free to use/modify/extend the library as you please - for it to serve your purpose. |
|
11 | + * As per the (un)license, the software is provided as is and the original author cannot be held liable |
|
12 | + * for any losses/damages directly or indirectly resulting from using thereof. |
|
13 | + * Attribution is welcome, but certainly not required. |
|
14 | + * |
|
15 | + * NOTE |
|
16 | + * The library is currently work-in-progress and it is certain that new features will be added in the process. |
|
17 | + * Consider this, therefore, as a preview product prone to abrupt and extensive changes that may affect functionality |
|
18 | + * of an external code adapted to a prior version(s) of the library. |
|
19 | + * Always explore the provisional compatibility of the library with your project in case you upgrade to a new version |
|
20 | + * of the library (by means of an extensive testing of the code in which you are exerting the library's features). |
|
21 | + * |
|
22 | + * PREREQUISITES |
|
23 | + * PHP 5.5+ |
|
24 | + * Module php-bcmath |
|
25 | + * |
|
26 | + * @author Václav Uruba |
|
27 | + * @version 0.3 |
|
28 | + * @license http://unlicense.org The Unlicense |
|
29 | + */ |
|
30 | 30 | namespace FinanCalc { |
31 | 31 | use Exception; |
32 | 32 | use FinanCalc\Constants\ErrorMessages; |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | */ |
115 | 115 | |
116 | 116 | private function populateFactoryClassesArray() { |
117 | - $factoryFiles = glob(FinanCalc::getPath() . Config::getConfigField('factories_relative_path') . '/*.php'); |
|
117 | + $factoryFiles = glob(FinanCalc::getPath().Config::getConfigField('factories_relative_path').'/*.php'); |
|
118 | 118 | $factoriesNamespace = Config::getConfigField('factories_namespace'); |
119 | 119 | |
120 | 120 | foreach ($factoryFiles as $factoryFile) { |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | try { |
128 | 128 | /** @noinspection PhpIncludeInspection */ |
129 | 129 | require_once($factoryFile); |
130 | - $factoryClassReflector = new ReflectionClass($factoriesNamespace . '\\' . $factoryClassName); |
|
130 | + $factoryClassReflector = new ReflectionClass($factoriesNamespace.'\\'.$factoryClassName); |
|
131 | 131 | } catch (ReflectionException $e) { |
132 | 132 | error_log(ErrorMessages::getFactoryClassExpectedInNamespaceMessage($factoryClassName, $factoriesNamespace)); |
133 | 133 | continue; |
@@ -94,10 +94,11 @@ |
||
94 | 94 | * @throws Exception |
95 | 95 | */ |
96 | 96 | public function getFactory($factoryClassName) { |
97 | - if (array_key_exists($factoryClassName, $this->factoryClasses)) |
|
98 | - return $this->factoryClasses[$factoryClassName]; |
|
99 | - else |
|
100 | - throw new Exception(ErrorMessages::getFactoryClassNotInitializedMessage($factoryClassName)); |
|
97 | + if (array_key_exists($factoryClassName, $this->factoryClasses)) { |
|
98 | + return $this->factoryClasses[$factoryClassName]; |
|
99 | + } else { |
|
100 | + throw new Exception(ErrorMessages::getFactoryClassNotInitializedMessage($factoryClassName)); |
|
101 | + } |
|
101 | 102 | } |
102 | 103 | |
103 | 104 | /** |
@@ -14,9 +14,9 @@ |
||
14 | 14 | protected $propResultArray = null; |
15 | 15 | |
16 | 16 | /** |
17 | - * @param $name |
|
17 | + * @param string $name |
|
18 | 18 | * @param $value |
19 | - * @param null $callbackBefore |
|
19 | + * @param \Closure $callbackBefore |
|
20 | 20 | * @throws Exception |
21 | 21 | */ |
22 | 22 | protected final function setProperty($name, $value, $callbackBefore = null) { |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | if (is_object($value) || is_null($value)) { |
29 | 29 | $this->$name = $value; |
30 | 30 | } else { |
31 | - $this->$name = (string) $value; |
|
31 | + $this->$name = (string)$value; |
|
32 | 32 | } |
33 | 33 | return; |
34 | 34 | } |
@@ -50,11 +50,11 @@ discard block |
||
50 | 50 | } |
51 | 51 | } |
52 | 52 | |
53 | - $processArray = function ($inputArray) use (&$processArray) { |
|
53 | + $processArray = function($inputArray) use (&$processArray) { |
|
54 | 54 | $processedArray = array(); |
55 | 55 | foreach ($inputArray as $key => $prop) { |
56 | 56 | if (is_string($prop)) { |
57 | - $propGetter = "get" . ucfirst($prop); |
|
57 | + $propGetter = "get".ucfirst($prop); |
|
58 | 58 | if (method_exists($this, $propGetter)) { |
59 | 59 | $processedArray[is_string($key) ? $key : $prop] = call_user_func(array($this, $propGetter)); |
60 | 60 | } else { |
@@ -31,7 +31,7 @@ |
||
31 | 31 | } |
32 | 32 | |
33 | 33 | /** |
34 | - * @param $key |
|
34 | + * @param string $key |
|
35 | 35 | * @return mixed |
36 | 36 | * @throws Exception |
37 | 37 | */ |
@@ -35,8 +35,8 @@ discard block |
||
35 | 35 | * @return mixed |
36 | 36 | * @throws Exception |
37 | 37 | */ |
38 | - public static function getConfigField($key){ |
|
39 | - if(empty(static::$configArray)) { |
|
38 | + public static function getConfigField($key) { |
|
39 | + if (empty(static::$configArray)) { |
|
40 | 40 | Config::init(); |
41 | 41 | } |
42 | 42 | |
@@ -53,8 +53,8 @@ discard block |
||
53 | 53 | * @param $key |
54 | 54 | * @param $value |
55 | 55 | */ |
56 | - public static function setConfigField($key, $value){ |
|
57 | - if(empty(static::$configArray)) { |
|
56 | + public static function setConfigField($key, $value) { |
|
57 | + if (empty(static::$configArray)) { |
|
58 | 58 | Config::init(); |
59 | 59 | } |
60 | 60 |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | /** |
17 | 17 | * Return string representation of this enum |
18 | 18 | * |
19 | - * @return string |
|
19 | + * @return integer |
|
20 | 20 | */ |
21 | 21 | public function getValue() |
22 | 22 | { |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | * </code> |
72 | 72 | * |
73 | 73 | * @param string $property |
74 | - * @return string |
|
74 | + * @return integer |
|
75 | 75 | */ |
76 | 76 | function __get($property) |
77 | 77 | { |
@@ -31,10 +31,11 @@ discard block |
||
31 | 31 | */ |
32 | 32 | public function setValue($value) |
33 | 33 | { |
34 | - if ($this->isValidEnumValue($value)) |
|
35 | - $this->value = $value; |
|
36 | - else |
|
37 | - throw new Exception(ErrorMessages::getInvalidTypeMessage()); |
|
34 | + if ($this->isValidEnumValue($value)) { |
|
35 | + $this->value = $value; |
|
36 | + } else { |
|
37 | + throw new Exception(ErrorMessages::getInvalidTypeMessage()); |
|
38 | + } |
|
38 | 39 | } |
39 | 40 | |
40 | 41 | /** |
@@ -48,7 +49,9 @@ discard block |
||
48 | 49 | $reflector = new \ReflectionClass(get_class($this)); |
49 | 50 | foreach ($reflector->getConstants() as $validValue) |
50 | 51 | { |
51 | - if ($validValue == $checkValue) return true; |
|
52 | + if ($validValue == $checkValue) { |
|
53 | + return true; |
|
54 | + } |
|
52 | 55 | } |
53 | 56 | return false; |
54 | 57 | } |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | /** |
29 | 29 | * @param $leftOperand |
30 | 30 | * @param $rightOperand |
31 | - * @param $messageOnException |
|
31 | + * @param string $messageOnException |
|
32 | 32 | * @return bool |
33 | 33 | */ |
34 | 34 | static function checkIfLeftOperandGreaterOrThrowAnException($leftOperand, $rightOperand, $messageOnException) { |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | } |
65 | 65 | |
66 | 66 | /** |
67 | - * @param $checkedVariable |
|
67 | + * @param null|\FinanCalc\Constants\AnnuityPaymentTypes $checkedVariable |
|
68 | 68 | * @return bool |
69 | 69 | */ |
70 | 70 | static function checkIfNotNull($checkedVariable) { |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | |
106 | 106 | /** |
107 | 107 | * @param $checkedVariable |
108 | - * @param $expectedResult |
|
108 | + * @param integer $expectedResult |
|
109 | 109 | * @return bool|null |
110 | 110 | */ |
111 | 111 | static function checkNumberRelativityToZero($checkedVariable, $expectedResult) { |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | } |
118 | 118 | |
119 | 119 | /** |
120 | - * @param $inputValue |
|
120 | + * @param string $inputValue |
|
121 | 121 | * @return string |
122 | 122 | */ |
123 | 123 | static function roundMoneyForDisplay($inputValue) { |
@@ -109,7 +109,7 @@ |
||
109 | 109 | * @return bool|null |
110 | 110 | */ |
111 | 111 | static function checkNumberRelativityToZero($checkedVariable, $expectedResult) { |
112 | - if(is_numeric((string)$checkedVariable)) { |
|
112 | + if (is_numeric((string)$checkedVariable)) { |
|
113 | 113 | return MathFuncs::comp($checkedVariable, "0.00") == $expectedResult; |
114 | 114 | } |
115 | 115 |
@@ -44,7 +44,7 @@ |
||
44 | 44 | } |
45 | 45 | |
46 | 46 | /** |
47 | - * @param $identifier |
|
47 | + * @param string $identifier |
|
48 | 48 | * @param $locale |
49 | 49 | * @param null $formatArgs |
50 | 50 | * @return string |
@@ -1,10 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * Created by PhpStorm. |
|
4 | - * User: uruba |
|
5 | - * Date: 2/15/2016 |
|
6 | - * Time: 2:54 PM |
|
7 | - */ |
|
3 | + * Created by PhpStorm. |
|
4 | + * User: uruba |
|
5 | + * Date: 2/15/2016 |
|
6 | + * Time: 2:54 PM |
|
7 | + */ |
|
8 | 8 | |
9 | 9 | namespace FinanCalc\Utils { |
10 | 10 |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | $locale = Config::getConfigField("locale"); |
28 | 28 | } |
29 | 29 | |
30 | - $localePath = FinanCalc::getPath() . "/locale/$locale.php"; |
|
30 | + $localePath = FinanCalc::getPath()."/locale/$locale.php"; |
|
31 | 31 | |
32 | 32 | if (!file_exists($localePath)) { |
33 | 33 | return null; |
@@ -55,8 +55,7 @@ discard block |
||
55 | 55 | $unformattedString = Strings::getString($identifier, $locale); |
56 | 56 | |
57 | 57 | return is_null($unformattedString) ? |
58 | - null : |
|
59 | - vsprintf($unformattedString, $formatArgs); |
|
58 | + null : vsprintf($unformattedString, $formatArgs); |
|
60 | 59 | } |
61 | 60 | } |
62 | 61 | } |
63 | 62 | \ No newline at end of file |