Merge pull request #10802 from greg0ire/psalm-5-13

greg0ire · web-flow · commit 814d8d4d39cd · 2023-06-27T00:05:00.000+02:00
Upgrade to Psalm 5.13
diff --git a/composer.json b/composer.json
@@ -49,7 +49,7 @@
         "symfony/cache": "^4.4 || ^5.4 || ^6.0",
         "symfony/var-exporter": "^4.4 || ^5.4 || ^6.2",
         "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0",
-        "vimeo/psalm": "4.30.0 || 5.12.0"
+        "vimeo/psalm": "4.30.0 || 5.13.0"
     },
     "conflict": {
         "doctrine/annotations": "<1.13 || >= 3.0"
diff --git a/lib/Doctrine/ORM/Mapping/Driver/AttributeDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AttributeDriver.php
@@ -23,7 +23,6 @@
 use function constant;
 use function defined;
 use function get_class;
-use function sprintf;
 
 use const PHP_VERSION_ID;
 
@@ -56,10 +55,10 @@ class AttributeDriver extends CompatibilityAnnotationDriver
     public function __construct(array $paths)
     {
         if (PHP_VERSION_ID < 80000) {
-            throw new LogicException(sprintf(
+            throw new LogicException(
                 'The attribute metadata driver cannot be enabled on PHP 7. Please upgrade to PHP 8 or choose a different'
                 . ' metadata driver.'
-            ));
+            );
         }
 
         $this->reader = new AttributeReader();
diff --git a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
@@ -50,27 +50,25 @@ class XmlDriver extends FileDriver
     public function __construct($locator, $fileExtension = self::DEFAULT_FILE_EXTENSION, bool $isXsdValidationEnabled = false)
     {
         if (! extension_loaded('simplexml')) {
-            throw new LogicException(sprintf(
+            throw new LogicException(
                 'The XML metadata driver cannot be enabled because the SimpleXML PHP extension is missing.'
                 . ' Please configure PHP with SimpleXML or choose a different metadata driver.'
-            ));
+            );
         }
 
         if (! $isXsdValidationEnabled) {
             Deprecation::trigger(
                 'doctrine/orm',
                 'https://github.com/doctrine/orm/pull/6728',
-                sprintf(
-                    'Using XML mapping driver with XSD validation disabled is deprecated'
-                    . ' and will not be supported in Doctrine ORM 3.0.'
-                )
+                'Using XML mapping driver with XSD validation disabled is deprecated'
+                . ' and will not be supported in Doctrine ORM 3.0.'
             );
         }
 
         if ($isXsdValidationEnabled && ! extension_loaded('dom')) {
-            throw new LogicException(sprintf(
+            throw new LogicException(
                 'XSD validation cannot be enabled because the DOM extension is missing.'
-            ));
+            );
         }
 
         $this->isXsdValidationEnabled = $isXsdValidationEnabled;
diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
@@ -48,11 +48,11 @@ public function __construct($locator, $fileExtension = self::DEFAULT_FILE_EXTENS
         );
 
         if (! class_exists(Yaml::class)) {
-            throw new LogicException(sprintf(
+            throw new LogicException(
                 'The YAML metadata driver cannot be enabled because the "symfony/yaml" library'
                 . ' is not installed. Please run "composer require symfony/yaml" or choose a different'
                 . ' metadata driver.'
-            ));
+            );
         }
 
         parent::__construct($locator, $fileExtension);
diff --git a/lib/Doctrine/ORM/ORMSetup.php b/lib/Doctrine/ORM/ORMSetup.php
@@ -24,7 +24,6 @@
 use function class_exists;
 use function extension_loaded;
 use function md5;
-use function sprintf;
 use function sys_get_temp_dir;
 
 final class ORMSetup
@@ -72,11 +71,11 @@ public static function createDefaultAnnotationDriver(
             __METHOD__
         );
         if (! class_exists(AnnotationReader::class)) {
-            throw new LogicException(sprintf(
+            throw new LogicException(
                 'The annotation metadata driver cannot be enabled because the "doctrine/annotations" library'
                 . ' is not installed. Please run "composer require doctrine/annotations" or choose a different'
                 . ' metadata driver.'
-            ));
+            );
         }
 
         $reader = new AnnotationReader();
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.12.0@f90118cdeacd0088e7215e64c0c99ceca819e176">
+<files psalm-version="5.13.0@a0a9c27630bcf8301ee78cb06741d2907d8c9fef">
   <file src="lib/Doctrine/ORM/AbstractQuery.php">
     <DeprecatedClass>
       <code>IterableResult</code>
@@ -213,11 +213,6 @@
       <code>CacheProvider</code>
     </MoreSpecificReturnType>
   </file>
-  <file src="lib/Doctrine/ORM/Cache/Region/FileLockRegion.php">
-    <ArgumentTypeCoercion>
-      <code><![CDATA[sprintf('%s/*.%s', $this->directory, self::LOCK_EXTENSION)]]></code>
-    </ArgumentTypeCoercion>
-  </file>
   <file src="lib/Doctrine/ORM/Cache/RegionsConfiguration.php">
     <RedundantCastGivenDocblockType>
       <code>(int) $defaultLifetime</code>
@@ -2456,9 +2451,6 @@
     </MissingTemplateParam>
   </file>
   <file src="lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php">
-    <ArgumentTypeCoercion>
-      <code><![CDATA[$path . '/*.yml']]></code>
-    </ArgumentTypeCoercion>
     <PossiblyUndefinedArrayOffset>
       <code><![CDATA[$column['type']]]></code>
     </PossiblyUndefinedArrayOffset>
