diff --git a/composer.json b/composer.json index ed7615765ce..6d8a28001ba 100644 --- a/composer.json +++ b/composer.json @@ -43,12 +43,12 @@ "doctrine/annotations": "^1.13", "doctrine/coding-standard": "^9.0", "phpbench/phpbench": "^0.16.10 || ^1.0", - "phpstan/phpstan": "1.4.1", + "phpstan/phpstan": "1.4.3", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.4", "squizlabs/php_codesniffer": "3.6.2", "symfony/cache": "^4.4 || ^5.4 || ^6.0", "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0", - "vimeo/psalm": "4.18.1" + "vimeo/psalm": "4.19.0" }, "conflict": { "doctrine/annotations": "<1.13 || >= 2.0" diff --git a/lib/Doctrine/ORM/PersistentCollection.php b/lib/Doctrine/ORM/PersistentCollection.php index 89f6710b6eb..aa8cb92b65a 100644 --- a/lib/Doctrine/ORM/PersistentCollection.php +++ b/lib/Doctrine/ORM/PersistentCollection.php @@ -481,6 +481,7 @@ public function offsetExists($offset): bool /** * {@inheritdoc} */ + #[ReturnTypeWillChange] public function offsetGet($offset) { return $this->get($offset); diff --git a/psalm-baseline.xml b/psalm-baseline.xml index d31f4564662..73538651193 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,5 +1,5 @@ - + IterableResult @@ -508,6 +508,12 @@ $entity + + + serialize + unserialize + + $currentLevel @@ -737,6 +743,9 @@ $className $this->namespace . '\\' . $className + + __toString + $joinColumn $joinColumn @@ -861,11 +870,8 @@ - + $columnDefinition - $length - $name - $type @@ -1244,11 +1250,10 @@ - + $cascade $indexBy $mappedBy - $targetEntity @@ -2042,6 +2047,9 @@ is_array($obj) + + __toString + is_object($obj) @@ -2235,22 +2243,46 @@ $this->parts + + __toString + $this->parts[0] + + + __toString + + + + __toString + $part $this->parts[0] + + + __toString + + + + + __toString + + $parts + + __toString + $this->conditionType @@ -2260,6 +2292,16 @@ $parts + + + __toString + + + + + __toString + + $allowedClasses @@ -2273,6 +2315,9 @@ + + __toString + $value @@ -2507,9 +2552,9 @@ - + Comparison::EQ - + @@ -2526,6 +2571,9 @@ $renameMode $renameMode + + __toString + $classMetadata->reflClass->name @@ -2903,6 +2951,9 @@ $key + + __toString + $spacePos $spacePos @@ -3236,8 +3287,9 @@ - + $metadata->changeTrackingPolicy + $simpleXml->asXML() AbstractExporter diff --git a/psalm.xml b/psalm.xml index b83e3f2a23d..3eb3f5c189e 100644 --- a/psalm.xml +++ b/psalm.xml @@ -90,18 +90,6 @@ - - - - - - - - - - - -