From a193f36f311985a33394db2c2b5c79615d6c660f Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Tue, 27 Sep 2022 22:13:19 -0700
Subject: [PATCH] More Carets in composer.json (#3090)

* More Carets in composer.json

Following up on PR #3086, there are 3 additional items in the require-dev section that should have carets. I probably accidentally removed them for tcpdf and mitoteam, which point to the current release anyhow. Dependabot appears to be responsible for mpdf, which is not pointing to the current release, but I have tested with current successfully.

* Minor Fix for Change Made Earlier Today

"Scrutinizer Tweak" causes a Phpstan error. Fix baseline to correct it.
---
 composer.json         | 6 +++---
 phpstan-baseline.neon | 5 -----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index e686788e..4f44b8bd 100644
--- a/composer.json
+++ b/composer.json
@@ -81,14 +81,14 @@
         "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
         "dompdf/dompdf": "^1.0 || ^2.0",
         "friendsofphp/php-cs-fixer": "^3.2",
-        "mitoteam/jpgraph": "10.2.4",
-        "mpdf/mpdf": "8.1.1",
+        "mitoteam/jpgraph": "^10.2.4",
+        "mpdf/mpdf": "^8.1.1",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpstan/phpstan": "^1.1",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpunit/phpunit": "^8.5 || ^9.0",
         "squizlabs/php_codesniffer": "^3.7",
-        "tecnickcom/tcpdf": "6.5"
+        "tecnickcom/tcpdf": "^6.5"
     },
     "suggest": {
         "ext-intl": "PHP Internationalization Functions",
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index c4b76cdd..b6c9deeb 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -5,11 +5,6 @@ parameters:
 			count: 3
 			path: src/PhpSpreadsheet/Calculation/Calculation.php
 
-		-
-			message: "#^Cannot call method attach\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Cell\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
 		-
 			message: "#^Cannot call method cellExists\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
 			count: 4