Add native return types everywhere (#409)

doctrine · Nov 11, 2023 · 22c1462 · 22c1462
1 parent b552b4c
commit 22c1462
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 61 deletions.
diff --git a/Command/CommandCompatibility.php b/Command/CommandCompatibility.php
diff --git a/Command/LoadDataFixturesDoctrineCommand.php b/Command/LoadDataFixturesDoctrineCommand.php
@@ -29,8 +29,6 @@
  */
 class LoadDataFixturesDoctrineCommand extends DoctrineCommand
 {
-    use CommandCompatibility;
-
     private SymfonyFixturesLoader $fixturesLoader;
 
     /** @var PurgerFactory[] */
@@ -55,8 +53,7 @@ public function __construct(SymfonyFixturesLoader $fixturesLoader, ?ManagerRegis
         $this->purgerFactories = $purgerFactories;
     }
 
-    /** @return void */
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('doctrine:fixtures:load')
@@ -92,7 +89,7 @@ protected function configure()
         );
     }
 
-    private function doExecute(InputInterface $input, OutputInterface $output): int
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $ui = new SymfonyStyle($input, $output);
 

diff --git a/DependencyInjection/DoctrineFixturesExtension.php b/DependencyInjection/DoctrineFixturesExtension.php
@@ -17,10 +17,8 @@ class DoctrineFixturesExtension extends Extension
 {
     /**
      * {@inheritDoc}
-     *
-     * @return void
      */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $loader = new XmlFileLoader($container, new FileLocator(dirname(__DIR__) . '/Resources/config'));
 

diff --git a/DoctrineFixturesBundle.php b/DoctrineFixturesBundle.php
@@ -11,8 +11,7 @@
 
 class DoctrineFixturesBundle extends Bundle
 {
-    /** @return void */
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container): void
     {
         $container->addCompilerPass(new FixturesCompilerPass());
         $container->addCompilerPass(new PurgerFactoryCompilerPass());

diff --git a/Purger/ORMPurgerFactory.php b/Purger/ORMPurgerFactory.php
@@ -5,7 +5,6 @@
 namespace Doctrine\Bundle\FixturesBundle\Purger;
 
 use Doctrine\Common\DataFixtures\Purger\ORMPurger;
-use Doctrine\Common\DataFixtures\Purger\PurgerInterface;
 use Doctrine\ORM\EntityManagerInterface;
 
 final class ORMPurgerFactory implements PurgerFactory
@@ -18,7 +17,7 @@ public function createForEntityManager(
         EntityManagerInterface $em,
         array $excluded = [],
         bool $purgeWithTruncate = false
-    ): PurgerInterface {
+    ): ORMPurger {
         $purger = new ORMPurger($em, $excluded);
         $purger->setPurgeMode($purgeWithTruncate ? ORMPurger::PURGE_MODE_TRUNCATE : ORMPurger::PURGE_MODE_DELETE);
 

diff --git a/Tests/IntegrationTest.php b/Tests/IntegrationTest.php
@@ -457,6 +457,5 @@ public function testRunCommandWithPurgeMode(): void
 
 interface ForwardCompatibleEntityManager extends EntityManagerInterface
 {
-    /** @return mixed */
-    public function wrapInTransaction(callable $func);
+    public function wrapInTransaction(callable $func): mixed;
 }
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -14,10 +14,7 @@
     <file>.</file>
     <exclude-pattern>/vendor</exclude-pattern>
 
-    <rule ref="Doctrine">
-        <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint"/>
-        <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint"/>
-    </rule>
+    <rule ref="Doctrine" />
 
 
     <rule ref="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming.SuperfluousSuffix">

diff --git a/psalm.xml b/psalm.xml
@@ -22,12 +22,4 @@
             <directory name="vendor" />
         </ignoreFiles>
     </projectFiles>
-
-    <issueHandlers>
-        <DuplicateClass>
-            <errorLevel type="suppress">
-                <file name="Command/CommandCompatibility.php"/>
-            </errorLevel>
-        </DuplicateClass>
-    </issueHandlers>
 </psalm>