Fix deprecation notices in CommandLogger (#2485)

doctrine · Nov 30, 2022 · eeedec2 · eeedec2
1 parent f5c1679
commit eeedec2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/APM/CommandLogger.php b/lib/Doctrine/ODM/MongoDB/APM/CommandLogger.php
@@ -44,12 +44,12 @@ public function unregister(): void
         $this->registered = false;
     }
 
-    public function commandStarted(CommandStartedEvent $event)
+    public function commandStarted(CommandStartedEvent $event): void
     {
         $this->startedCommands[$event->getRequestId()] = $event;
     }
 
-    public function commandSucceeded(CommandSucceededEvent $event)
+    public function commandSucceeded(CommandSucceededEvent $event): void
     {
         $commandStartedEvent = $this->findAndRemoveCommandStartedEvent($event->getRequestId());
         if (! $commandStartedEvent) {
@@ -59,7 +59,7 @@ public function commandSucceeded(CommandSucceededEvent $event)
         $this->logCommand(Command::createForSucceededCommand($commandStartedEvent, $event));
     }
 
-    public function commandFailed(CommandFailedEvent $event)
+    public function commandFailed(CommandFailedEvent $event): void
     {
         $commandStartedEvent = $this->findAndRemoveCommandStartedEvent($event->getRequestId());
         if (! $commandStartedEvent) {

diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataFactory.php
@@ -37,7 +37,7 @@
  *
  * @internal
  *
- * @method ClassMetadata[] getAllMetadata()
+ * @method list<ClassMetadata> getAllMetadata()
  * @method ClassMetadata[] getLoadedMetadata()
  * @method ClassMetadata getMetadataFor($className)
  */

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -137,12 +137,6 @@ parameters:
             count: 1
             path: tests/Doctrine/ODM/MongoDB/Tests/DocumentRepositoryTest.php
 
-        # 'strategy' offset is defined as nullable, but here there is no check here
-        -
-            message: "#^Offset 'strategy' does not exist on array\\{\\}\\|array\\{type\\?\\: string, fieldName\\: string, name\\: string, isCascadeRemove\\: bool, isCascadePersist\\: bool, isCascadeRefresh\\: bool, isCascadeMerge\\: bool, isCascadeDetach\\: bool, \\.\\.\\.\\}\\.$#"
-            count: 1
-            path: lib/Doctrine/ODM/MongoDB/UnitOfWork.php
-
         # When iterating over SimpleXMLElement, we cannot know the key values
         -
             message: "#^Parameter \\#2 \\$mapping of method Doctrine\\\\ODM\\\\MongoDB\\\\Mapping\\\\Driver\\\\XmlDriver\\:\\:addFieldMapping\\(\\) expects array#"
@@ -177,7 +171,7 @@ parameters:
         # compatibility layer for doctrine/persistence ^2.4 || ^3.0
         -
             message: "#.*#"
-            count: 3
+            count: 1
             path: lib/Doctrine/ODM/MongoDB/Event/OnClearEventArgs
 
         -