[TASK] Update Composer Dependencies

Use new versions for: - friendsofphp/php-cs-fixer - helmich/typo3-typoscript-lint - overtrue/phplint Related: extcode#403
pixelant · Oct 11, 2022 · 64fd318 · 64fd318
1 parent 8784aa5
commit 64fd318
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 24 deletions.
diff --git a/Build/.php-cs-fixer.dist.php b/Build/.php-cs-fixer.dist.php
@@ -13,7 +13,7 @@
     ->setRules([
         '@PSR2' => true,
         'no_leading_import_slash' => true,
-        'no_trailing_comma_in_singleline_array' => true,
+        'no_trailing_comma_in_singleline' => true,
         'no_singleline_whitespace_before_semicolons' => true,
         'no_unused_imports' => true,
         'concat_space' => ['spacing' => 'one'],

diff --git a/Classes/Hooks/ItemsProcFunc.php b/Classes/Hooks/ItemsProcFunc.php
@@ -24,7 +24,6 @@
 
 class ItemsProcFunc
 {
-
     /** @var TemplateLayout $templateLayoutsUtility */
     protected $templateLayoutsUtility;
 

diff --git a/Classes/Utility/EvalPrice.php b/Classes/Utility/EvalPrice.php
@@ -11,7 +11,6 @@
 
 class EvalPrice
 {
-
     /**
      * Returns Field JS
      *

diff --git a/Classes/Utility/TemplateLayout.php b/Classes/Utility/TemplateLayout.php
@@ -15,7 +15,6 @@
 
 class TemplateLayout implements SingletonInterface
 {
-
     /**
      * Get available template layouts for a certain page
      *

diff --git a/Classes/ViewHelpers/CsvHeaderViewHelper.php b/Classes/ViewHelpers/CsvHeaderViewHelper.php
@@ -14,7 +14,6 @@
 
 class CsvHeaderViewHelper extends AbstractViewHelper
 {
-
     /**
      * Output is escaped already. We must not escape children, to avoid double encoding.
      *

diff --git a/Classes/ViewHelpers/CsvValuesViewHelper.php b/Classes/ViewHelpers/CsvValuesViewHelper.php
@@ -15,7 +15,6 @@
 
 class CsvValuesViewHelper extends AbstractViewHelper
 {
-
     /**
      * Output is escaped already. We must not escape children, to avoid double encoding.
      *

diff --git a/Classes/ViewHelpers/Format/NothingViewHelper.php b/Classes/ViewHelpers/Format/NothingViewHelper.php
@@ -13,7 +13,6 @@
 
 class NothingViewHelper extends AbstractViewHelper
 {
-
     /**
      * Output is escaped already. We must not escape children, to avoid double encoding.
      *

diff --git a/Tests/Unit/Domain/Model/Cart/CartTest.php b/Tests/Unit/Domain/Model/Cart/CartTest.php
@@ -17,7 +17,6 @@
 
 class CartTest extends UnitTestCase
 {
-
     /**
      * @var Cart
      */
@@ -621,9 +620,10 @@ public function addFirstNetCartProductToNetCartChangeGrossOfCart(): void
 
         $this->netCart->addProduct($netProduct);
 
-        self::assertEquals(
+        self::assertEqualsWithDelta(
             $productPrice * (1 + $this->normalTaxClass->getCalc()),
-            $this->netCart->getGross()
+            $this->netCart->getGross(),
+            0.000000000001
         );
     }
 
@@ -671,9 +671,10 @@ public function addFirstNetCartProductToGrossCartChangeGrossOfCart(): void
 
         $this->grossCart->addProduct($netProduct);
 
-        self::assertEquals(
+        self::assertEqualsWithDelta(
             $productPrice * (1 + $this->normalTaxClass->getCalc()),
-            $this->grossCart->getGross()
+            $this->grossCart->getGross(),
+            0.000000000001
         );
     }
 
@@ -699,9 +700,10 @@ public function addFirstCartProductToCartChangeTaxArray(): void
 
         $cartTaxes = $this->grossCart->getTaxes();
 
-        self::assertEquals(
+        self::assertEqualsWithDelta(
             $productPrice - ($productPrice / (1 + $this->normalTaxClass->getCalc())),
-            $cartTaxes[$taxId]
+            $cartTaxes[$taxId],
+            0.000000000001
         );
     }
 
@@ -738,9 +740,10 @@ public function addSecondCartProductWithSameTaxClassToCartChangeTaxArray(): void
 
         $cartTaxes = $this->grossCart->getTaxes();
 
-        self::assertEquals(
+        self::assertEqualsWithDelta(
             ($firstCartProductPrice + $secondCartProductPrice) - (($firstCartProductPrice + $secondCartProductPrice) / (1 + $this->normalTaxClass->getCalc())),
-            $cartTaxes[$this->normalTaxClass->getId()]
+            $cartTaxes[$this->normalTaxClass->getId()],
+            0.000000000001
         );
     }
 
@@ -777,13 +780,15 @@ public function addSecondCartProductWithDifferentTaxClassToCartChangeTaxArray():
 
         $cartTaxes = $this->grossCart->getTaxes();
 
-        self::assertEquals(
+        self::assertEqualsWithDelta(
             $firstCartProductPrice - ($firstCartProductPrice / (1 + $this->normalTaxClass->getCalc())),
-            $cartTaxes[$this->normalTaxClass->getId()]
+            $cartTaxes[$this->normalTaxClass->getId()],
+            0.000000000001
         );
-        self::assertEquals(
+        self::assertEqualsWithDelta(
             $secondCartProductPrice - ($secondCartProductPrice / (1 + $this->reducedTaxClass->getCalc())),
-            $cartTaxes[$this->reducedTaxClass->getId()]
+            $cartTaxes[$this->reducedTaxClass->getId()],
+            0.000000000001
         );
     }
 

diff --git a/Tests/Unit/Domain/Model/Cart/ProductTest.php b/Tests/Unit/Domain/Model/Cart/ProductTest.php
@@ -16,7 +16,6 @@
 
 class ProductTest extends UnitTestCase
 {
-
     /**
      * @var TaxClass
      */

diff --git a/composer.json b/composer.json
@@ -53,9 +53,9 @@
     "require-dev": {
         "typo3/testing-framework": "^6.0",
         "typo3/cms-dashboard": "^10.4 || ^11.5",
-        "friendsofphp/php-cs-fixer": "^2.14",
-        "helmich/typo3-typoscript-lint": "^2.0",
-        "overtrue/phplint": "^1.1",
+        "friendsofphp/php-cs-fixer": "^2.19 || ^3.11",
+        "helmich/typo3-typoscript-lint": "^2.5",
+        "overtrue/phplint": "^3.2 || ^4.3 || ^5.3",
         "rector/rector": "^0.11",
         "phpstan/phpstan": "^0.12.99"
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,6 @@ @@
     class ItemsProcFunc
     {
         /** @var TemplateLayout $templateLayoutsUtility */
         protected $templateLayoutsUtility;
@@ Expand Down @@