Merge branch '1.11' into 1.12

GSadee · GSadee · commit 61a31030d46d · 2024-06-20T06:46:57.000+02:00
* 1.11:
  [Maintenance] Ignore invalid reference to "annotation_reader"
  [Maintenance] Fix psalm
diff --git a/tests/Application/config/services.yaml b/tests/Application/config/services.yaml
@@ -73,7 +73,7 @@ services:
     Gedmo\Sortable\SortableListener:
         calls:
             -
-                setAnnotationReader: ['@annotation_reader']
+                setAnnotationReader: ['@?annotation_reader']
         tags:
             -
                 name: doctrine.event_subscriber

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ services:`
`73`	`73`	`Gedmo\Sortable\SortableListener:`
`74`	`74`	`calls:`
`75`	`75`	`-`
`76`		`- setAnnotationReader: ['@annotation_reader']`
	`76`	`+ setAnnotationReader: ['@?annotation_reader']`
`77`	`77`	`tags:`
`78`	`78`	`-`
`79`	`79`	`name: doctrine.event_subscriber`