| @@ -175,10 +175,13 @@ | ||
| 175 | 175 | // We've been given a string to parse to extract the real and imaginary parts, and any suffix |
| 176 | 176 | list($realPart, $imaginaryPart, $suffix) = self::parseComplex($realPart); |
| 177 | 177 | } |
| 178 | 178 | } |
| 179 | - if ($imaginaryPart <> 0.0 && empty($suffix)) { | |
| 179 | + | |
| 180 | + if ($imaginaryPart != 0.0 && empty($suffix)) { | |
| 180 | 181 | $suffix = 'i'; |
| 182 | + } elseif ($imaginaryPart == 0.0 && !empty($suffix)) { | |
| 183 | + $suffix = ''; | |
| 181 | 184 | } |
| 182 | 185 | |
| 183 | 186 | // Set parsed values in our properties |
| 184 | 187 | $this->realPart = (float) $realPart; |
| @@ -372,14 +375,14 @@ | ||
| 372 | 375 | { |
| 373 | 376 | $functionName = strtolower(str_replace('_', '', $functionName)); |
| 374 | 377 | |
| 375 | 378 | // Test for function calls |
| 376 | - if (in_array($functionName, self::$functions)) { | |
| 379 | + if (in_array($functionName, self::$functions, true)) { | |
| 377 | 380 | $functionName = "\\" . __NAMESPACE__ . "\\{$functionName}"; |
| 378 | 381 | return $functionName($this, ...$arguments); |
| 379 | 382 | } |
| 380 | 383 | // Test for operation calls |
| 381 | - if (in_array($functionName, self::$operations)) { | |
| 384 | + if (in_array($functionName, self::$operations, true)) { | |
| 382 | 385 | $functionName = "\\" . __NAMESPACE__ . "\\{$functionName}"; |
| 383 | 386 | return $functionName($this, ...$arguments); |
| 384 | 387 | } |
| 385 | 388 | throw new Exception('Function or Operation does not exist'); |
