Review

dunglas · dunglas · commit f0d10f285860 · 2018-07-13T13:53:44.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
@@ -4,8 +4,8 @@ CHANGELOG
 4.2.0
 -----
 
- * deprecated injection `ClassMetadataFactory` in `DoctrineExtractor`,
-   and instance of `EntityManagerInterface` must be injected instead
+ * deprecated injecting `ClassMetadataFactory` in `DoctrineExtractor`,
+   an instance of `EntityManagerInterface` should be injected instead
 
 4.1.0
 -----
diff --git a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
@@ -32,14 +32,14 @@ class DoctrineExtractor implements PropertyListExtractorInterface, PropertyTypeE
     private $classMetadataFactory;
 
     /**
-     * @param EntityManagerInterface|ClassMetadataFactory $entityManager
+     * @param EntityManagerInterface $entityManager
      */
     public function __construct($entityManager)
     {
         if ($entityManager instanceof EntityManagerInterface) {
             $this->entityManager = $entityManager;
         } else {
-            @trigger_error(sprintf('Injecting an instance of "%s" in "%s" is deprecated since version 4.2 and will not be possible anymore in 5.0. Inject an instance of "%s" instead.', ClassMetadataFactory::class, __CLASS__, EntityManagerInterface::class), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Injecting an instance of "%s" in "%s" is deprecated since Symfony 4.2, inject an instance of "%s" instead.', ClassMetadataFactory::class, __CLASS__, EntityManagerInterface::class), E_USER_DEPRECATED);
             $this->classMetadataFactory = $entityManager;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -32,14 +32,14 @@ class DoctrineExtractor implements PropertyListExtractorInterface, PropertyTypeE`
`32`	`32`	`private $classMetadataFactory;`
`33`	`33`
`34`	`34`	`/**`
`35`		`- * @param EntityManagerInterface\|ClassMetadataFactory $entityManager`
	`35`	`+ * @param EntityManagerInterface $entityManager`
`36`	`36`	`*/`
`37`	`37`	`public function __construct($entityManager)`
`38`	`38`	`{`
`39`	`39`	`if ($entityManager instanceof EntityManagerInterface) {`
`40`	`40`	`$this->entityManager = $entityManager;`
`41`	`41`	`} else {`
`42`		`- @trigger_error(sprintf('Injecting an instance of "%s" in "%s" is deprecated since version 4.2 and will not be possible anymore in 5.0. Inject an instance of "%s" instead.', ClassMetadataFactory::class, __CLASS__, EntityManagerInterface::class), E_USER_DEPRECATED);`
	`42`	`+ @trigger_error(sprintf('Injecting an instance of "%s" in "%s" is deprecated since Symfony 4.2, inject an instance of "%s" instead.', ClassMetadataFactory::class, __CLASS__, EntityManagerInterface::class), E_USER_DEPRECATED);`
`43`	`43`	`$this->classMetadataFactory = $entityManager;`
`44`	`44`	`}`
`45`	`45`	`}`