add return type hints to EntityFactory

symfony · Oct 22, 2023 · 3ceed63 · 3ceed63
1 parent b9334ab
commit 3ceed63
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 36 deletions.
diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
@@ -151,30 +151,6 @@ diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/Regist
 +    public function process(ContainerBuilder $container): void
      {
          if (!$this->enabled($container)) {
-diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php
---- a/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php
-+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php
-@@ -34,5 +34,5 @@ class EntityFactory implements UserProviderFactoryInterface
-      * @return void
-      */
--    public function create(ContainerBuilder $container, string $id, array $config)
-+    public function create(ContainerBuilder $container, string $id, array $config): void
-     {
-         $container
-@@ -47,5 +47,5 @@ class EntityFactory implements UserProviderFactoryInterface
-      * @return string
-      */
--    public function getKey()
-+    public function getKey(): string
-     {
-         return $this->key;
-@@ -55,5 +55,5 @@ class EntityFactory implements UserProviderFactoryInterface
-      * @return void
-      */
--    public function addConfiguration(NodeDefinition $node)
-+    public function addConfiguration(NodeDefinition $node): void
-     {
-         $node
 diff --git a/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php b/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php
 --- a/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php
 +++ b/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php

diff --git a/UPGRADE-6.4.md b/UPGRADE-6.4.md
@@ -95,6 +95,7 @@ DependencyInjection
 DoctrineBridge
 --------------
 
+ * [BC Break] Add return type-hints to `EntityFactory`
  * Deprecate `DbalLogger`, use a middleware instead
  * Deprecate not constructing `DoctrineDataCollector` with an instance of `DebugDataHolder`
  * Deprecate `DoctrineDataCollector::addLogger()`, use a `DebugDataHolder` instead

diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 6.4
 ---
 
+ * [BC BREAK] Add return type-hints to `EntityFactory`
  * Deprecate `DbalLogger`, use a middleware instead
  * Deprecate not constructing `DoctrineDataCollector` with an instance of `DebugDataHolder`
  * Deprecate `DoctrineDataCollector::addLogger()`, use a `DebugDataHolder` instead

diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php
@@ -19,6 +19,8 @@
 /**
  * EntityFactory creates services for Doctrine user provider.
  *
+ * @final since Symfony 6.4
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Christophe Coevoet <stof@notk.org>
  */
@@ -30,10 +32,7 @@ public function __construct(
     ) {
     }
 
-    /**
-     * @return void
-     */
-    public function create(ContainerBuilder $container, string $id, array $config)
+    public function create(ContainerBuilder $container, string $id, array $config): void
     {
         $container
             ->setDefinition($id, new ChildDefinition($this->providerId))
@@ -43,18 +42,12 @@ public function create(ContainerBuilder $container, string $id, array $config)
         ;
     }
 
-    /**
-     * @return string
-     */
-    public function getKey()
+    public function getKey(): string
     {
         return $this->key;
     }
 
-    /**
-     * @return void
-     */
-    public function addConfiguration(NodeDefinition $node)
+    public function addConfiguration(NodeDefinition $node): void
     {
         $node
             ->children()