From 786e1fc0a240cecb328979481a662ce0d56a072b Mon Sep 17 00:00:00 2001 From: fazi Date: Sun, 30 Jul 2017 19:58:38 +0200 Subject: [PATCH] little cleanup --- composer.json | 2 +- src/BCMathExtended/BC.php | 58 ++++++++++++++------------------------- tests/Unit/BCTest.php | 2 +- 3 files changed, 22 insertions(+), 40 deletions(-) mode change 100755 => 100644 composer.json mode change 100755 => 100644 src/BCMathExtended/BC.php mode change 100755 => 100644 tests/Unit/BCTest.php diff --git a/composer.json b/composer.json old mode 100755 new mode 100644 index ff5ce6a..309acd4 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "ext-bcmath": "*" }, "require-dev": { - "phpunit/phpunit": "*" + "phpunit/phpunit": "~5.7" }, "license": "MIT", "authors": [ diff --git a/src/BCMathExtended/BC.php b/src/BCMathExtended/BC.php old mode 100755 new mode 100644 index a125cb4..62dc09d --- a/src/BCMathExtended/BC.php +++ b/src/BCMathExtended/BC.php @@ -9,7 +9,7 @@ class BC { /** - * @param null|int $scale + * @param int $scale */ public static function setScale($scale) { @@ -24,11 +24,9 @@ public static function ceil($number) { $number = (string)$number; - if (true === self::checkIsFloat($number) and true === self::checkIsFloatCleanZeros($number)) - { + if (self::checkIsFloat($number) && self::checkIsFloatCleanZeros($number)) { $result = 1; - if (true === self::isNegative($number)) - { + if (self::isNegative($number)) { --$result; } $number = bcadd($number, $result, 0); @@ -71,8 +69,7 @@ private static function isNegative($number) private static function checkNumber($number) { $number = str_replace('+', '', filter_var($number, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)); - if ('-0' === $number || !is_numeric($number)) - { + if ('-0' === $number || !is_numeric($number)) { return '0'; } return $number; @@ -87,10 +84,8 @@ public static function round($number, $precision = 0) { $number = (string)$number; - if (true === self::checkIsFloat($number)) - { - if (true === self::isNegative($number)) - { + if (self::checkIsFloat($number)) { + if (self::isNegative($number)) { return bcsub($number, '0.' . str_repeat('0', $precision) . '5', $precision); } @@ -108,11 +103,9 @@ public static function floor($number) { $number = (string)$number; - if (true === self::checkIsFloat($number) and true === self::checkIsFloatCleanZeros($number)) - { + if (self::checkIsFloat($number) && self::checkIsFloatCleanZeros($number)) { $result = 0; - if (true === self::isNegative($number)) - { + if (self::isNegative($number)) { --$result; } $number = bcadd($number, $result, 0); @@ -129,9 +122,8 @@ public static function abs($number) { $number = (string)$number; - if (true === self::isNegative($number)) - { - $number = substr($number, 1); + if (self::isNegative($number)) { + $number = (string)substr($number, 1); } return self::checkNumber($number); @@ -148,9 +140,9 @@ public static function rand($min, $max) $min = (string)$min; $difference = bcadd(bcsub($max, $min), 1); - $rand_percent = bcdiv(mt_rand(), mt_getrandmax(), 8); + $randPercent = bcdiv(mt_rand(), mt_getrandmax(), 8); - return bcadd($min, bcmul($difference, $rand_percent, 8), 0); + return bcadd($min, bcmul($difference, $randPercent, 8), 0); } /** @@ -160,16 +152,11 @@ public static function rand($min, $max) public static function max() { $max = null; - foreach (func_get_args() as $value) - { - if (null === $max) - { + foreach (func_get_args() as $value) { + if (null === $max) { $max = $value; - } - else - { - if (bccomp($max, $value) < 0) - { + } else { + if (bccomp($max, $value) < 0) { $max = $value; } } @@ -185,16 +172,11 @@ public static function max() public static function min() { $min = null; - foreach (func_get_args() as $value) - { - if (null === $min) - { + foreach (func_get_args() as $value) { + if (null === $min) { $min = $value; - } - else - { - if (bccomp($min, $value) > 0) - { + } else { + if (bccomp($min, $value) > 0) { $min = $value; } } diff --git a/tests/Unit/BCTest.php b/tests/Unit/BCTest.php old mode 100755 new mode 100644 index d1db066..3b93703 --- a/tests/Unit/BCTest.php +++ b/tests/Unit/BCTest.php @@ -7,7 +7,7 @@ /** * Class BcTest */ -class BcTest extends \PHPUnit_Framework_TestCase +class BCTest extends \PHPUnit_Framework_TestCase { /** * @test