Merge pull request #259 from AOEpeople/security/update-packages

use a better method to compore float values
AOEpeople · Oct 13, 2022 · 2236e5d · 2236e5d
2 parents 503cb09 + 59ec86b
commit 2236e5d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Check code formatting with PHP-CS-Fixer
         run: |
           rm composer.json composer.lock
-          composer require friendsofphp/php-cs-fixer
+          composer require friendsofphp/php-cs-fixer:3.4
           vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.dist --diff --dry-run -v
 
   lint:

diff --git a/src/Mealz/AccountingBundle/Tests/Controller/Payment/CashControllerTest.php b/src/Mealz/AccountingBundle/Tests/Controller/Payment/CashControllerTest.php
@@ -91,7 +91,9 @@ function ($node, $i) {
             $transactionAmount += (float) trim(substr($transaction, 1, strpos($transaction, '€')));
         }
 
-        $calculatedBalance = round($previousBalance - $participationAmount + $transactionAmount, 2);
-        $this->assertEquals($currentBalance, $calculatedBalance);
+        $assumedTotalAmount = $previousBalance - $participationAmount + $transactionAmount;
+
+        $epsilon = 0.00001;
+        $this->assertTrue(abs($currentBalance - $assumedTotalAmount) < $epsilon);
     }
 }
diff --git a/src/Mealz/AccountingBundle/Tests/Repository/TransactionRepositoryTest.php b/src/Mealz/AccountingBundle/Tests/Repository/TransactionRepositoryTest.php
@@ -85,10 +85,11 @@ public function testTransactionsSummedUpByLastMonth(): void
         $usersTotalAmount = floatval($userData[$firstTransaction->getProfile()->getUsername()]['amount']);
 
         // calculate sum of amount for tempTransactions
-        $assumedTotalAmount = round($this->getAssumedTotalAmountForTransactionsFromLastMonth($tempTransactions), 2);
+        $assumedTotalAmount = $this->getAssumedTotalAmountForTransactionsFromLastMonth($tempTransactions);
 
         // compare both amounts
-        $this->assertEquals($usersTotalAmount, $assumedTotalAmount);
+        $epsilon = 0.00001;
+        $this->assertTrue(abs($usersTotalAmount - $assumedTotalAmount) < $epsilon);
     }
 
     /**