Merge branch 'release/7.1.5' into dev

Aerendir · Mar 15, 2024 · 58c5034 · 58c5034
2 parents cd34cc5 + d301e74
commit 58c5034
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 9 deletions.
diff --git a/.baseline-phpstan.neon b/.baseline-phpstan.neon
@@ -165,11 +165,6 @@ parameters:
 			count: 1
 			path: src/Vat/VatRate.php
 
-		-
-			message: "#^Return type of call to method PHPUnit\\\\Framework\\\\TestCase\\:\\:createMock\\(\\) contains unresolvable type\\.$#"
-			count: 1
-			path: tests/Email/Bridge/Doctrine/EmailTypeTest.php
-
 		-
 			message: "#^Property SerendipityHQ\\\\Component\\\\ValueObjects\\\\Tests\\\\Money\\\\Bridge\\\\Doctrine\\\\MoneyTypeTest\\:\\:\\$platform is never read, only written\\.$#"
 			count: 1

diff --git a/.baseline-psalm.xml b/.baseline-psalm.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.22.0@fe2c67ec89f358940f90db05efd2d663388b45a6">
+<files psalm-version="5.23.1@8471a896ccea3526b26d082f4461eeea467f10a4">
   <file src="src/Address/Bridge/Symfony/Form/DataTransformer/AddressTransformer.php">
     <MissingTemplateParam>
       <code><![CDATA[DataTransformerInterface]]></code>

diff --git a/bin/baselines b/bin/baselines
@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
 
 vendor/bin/phpstan analyse --generate-baseline .baseline-phpstan.neon
-vendor-bin/phan/vendor/bin/phan --dead-code-detection --save-baseline .baseline-phan.php
+vendor-bin/phan/vendor/bin/phan --dead-code-detection --save-baseline .baseline-phan.php --color --color-scheme=eclipse_dark
 vendor-bin/phpunit/vendor/bin/psalm --set-baseline=.baseline-psalm.xml
diff --git a/bin/validate b/bin/validate
@@ -3,7 +3,7 @@
 vendor/bin/rector process --dry-run &&
 vendor-bin/phpcs/vendor/bin/php-cs-fixer fix --allow-risky yes --dry-run -v &&
 vendor/bin//phpstan analyse &&
-vendor-bin/phan/vendor/bin/phan --dead-code-detection &&
+vendor-bin/phan/vendor/bin/phan --dead-code-detection --color --color-scheme=eclipse_dark &&
 vendor-bin/phpunit/vendor/bin/psalm --find-unused-psalm-suppress &&
 vendor-bin/phpunit/vendor/bin/phpunit --prepend var/xdebug-filter.php --coverage-html var/coverage/html &&
 symfony security:check &&

diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     "require": {
         "php": "^7.4|^8.0",
         "darsyn/ip": "^4",
-        "egulias/email-validator": "^2.1.10 || ^3.0.0",
+        "egulias/email-validator": "^2.1.10 || ^3.0.0 || ^4.0.0",
         "giggsey/libphonenumber-for-php": "^8.8",
         "laminas/laminas-uri": "^2.6.2",
         "moneyphp/money": "^3.3|^4.0",