Add last missing return types

doctrine · Mar 12, 2024 · bebf2a7 · bebf2a7
1 parent 5a655dc
commit bebf2a7
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 26 deletions.
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -56,11 +56,6 @@
         <exclude-pattern>src/*</exclude-pattern>
     </rule>
 
-    <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint">
-        <!-- Adding return types is a BC break in most cases. -->
-        <exclude-pattern>src/*</exclude-pattern>
-    </rule>
-
     <rule ref="Squiz.Classes.ClassFileName.NoMatch">
         <exclude-pattern>tests/*</exclude-pattern>
     </rule>

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.17.0@c620f6e80d0abfca532b00bda366062aaedf6e5d">
+<files psalm-version="5.23.1@8471a896ccea3526b26d082f4461eeea467f10a4">
   <file src="src/Executor/PHPCRExecutor.php">
     <UndefinedClass>
-      <code>DocumentManagerInterface</code>
-      <code>DocumentManagerInterface</code>
+      <code><![CDATA[DocumentManagerInterface]]></code>
+      <code><![CDATA[DocumentManagerInterface]]></code>
     </UndefinedClass>
   </file>
   <file src="src/Purger/PHPCRPurger.php">
     <UndefinedClass>
       <code><![CDATA[$this->dm]]></code>
-      <code>DocumentManager</code>
-      <code>DocumentManagerInterface|null</code>
-      <code>NodeHelper</code>
-      <code>private</code>
+      <code><![CDATA[DocumentManager]]></code>
+      <code><![CDATA[DocumentManagerInterface|null]]></code>
+      <code><![CDATA[NodeHelper]]></code>
+      <code><![CDATA[private]]></code>
     </UndefinedClass>
   </file>
   <file src="src/ReferenceRepository.php">
     <UndefinedClass>
-      <code>PhpcrDocumentManager</code>
-      <code>PhpcrDocumentManager</code>
+      <code><![CDATA[PhpcrDocumentManager]]></code>
+      <code><![CDATA[PhpcrDocumentManager]]></code>
     </UndefinedClass>
   </file>
 </files>
diff --git a/src/AbstractFixture.php b/src/AbstractFixture.php
@@ -22,10 +22,7 @@ abstract class AbstractFixture implements SharedFixtureInterface
      */
     protected $referenceRepository;
 
-    /**
-     * {@inheritDoc}
-     */
-    public function setReferenceRepository(ReferenceRepository $referenceRepository)
+    public function setReferenceRepository(ReferenceRepository $referenceRepository): void
     {
         $this->referenceRepository = $referenceRepository;
     }

diff --git a/src/DependentFixtureInterface.php b/src/DependentFixtureInterface.php
@@ -15,5 +15,5 @@ interface DependentFixtureInterface
      *
      * @psalm-return array<class-string<FixtureInterface>>
      */
-    public function getDependencies();
+    public function getDependencies(): array;
 }
diff --git a/src/Executor/ORMExecutor.php b/src/Executor/ORMExecutor.php
@@ -19,7 +19,7 @@ class ORMExecutor extends AbstractExecutor
     public function execute(array $fixtures, bool $append = false): void
     {
         $executor = $this;
-        $this->em->wrapInTransaction(static function (EntityManagerInterface $em) use ($executor, $fixtures, $append) {
+        $this->em->wrapInTransaction(static function (EntityManagerInterface $em) use ($executor, $fixtures, $append): void {
             if ($append === false) {
                 $executor->purge();
             }

diff --git a/src/Executor/PHPCRExecutor.php b/src/Executor/PHPCRExecutor.php
@@ -42,7 +42,7 @@ public function execute(array $fixtures, bool $append = false): void
     {
         $that = $this;
 
-        $function = static function ($dm) use ($append, $that, $fixtures) {
+        $function = static function ($dm) use ($append, $that, $fixtures): void {
             if ($append === false) {
                 $that->purge();
             }

diff --git a/src/FixtureInterface.php b/src/FixtureInterface.php
@@ -14,5 +14,5 @@ interface FixtureInterface
     /**
      * Load data fixtures with the passed EntityManager
      */
-    public function load(ObjectManager $manager);
+    public function load(ObjectManager $manager): void;
 }
diff --git a/src/Loader.php b/src/Loader.php
@@ -130,7 +130,7 @@ public function getFixture(string $className): FixtureInterface
     /**
      * Add a fixture object instance to the loader.
      */
-    public function addFixture(FixtureInterface $fixture)
+    public function addFixture(FixtureInterface $fixture): void
     {
         $fixtureClass = $fixture::class;
 

diff --git a/src/ReferenceRepository.php b/src/ReferenceRepository.php
@@ -53,8 +53,6 @@ public function __construct(ObjectManager $manager)
      *
      * @param object $reference Reference object
      * @param object $uow       Unit of work
-     *
-     * @return array
      */
     protected function getIdentifier(object $reference, object $uow): array
     {

diff --git a/src/SharedFixtureInterface.php b/src/SharedFixtureInterface.php
@@ -12,5 +12,5 @@
  */
 interface SharedFixtureInterface extends FixtureInterface
 {
-    public function setReferenceRepository(ReferenceRepository $referenceRepository);
+    public function setReferenceRepository(ReferenceRepository $referenceRepository): void;
 }