Merge pull request #99 from greg0ire/conditional-types

Leverage conditional types
doctrine · Dec 12, 2022 · 49e0c1c · 49e0c1c
2 parents 8275278 + 83417d6
commit 49e0c1c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/psalm.xml b/psalm.xml
@@ -47,6 +47,11 @@
                 <file name="src/AbstractLexer.php" />
             </errorLevel>
         </MixedAssignment>
+        <MixedReturnStatement>
+            <errorLevel type="suppress">
+                <file name="src/Token.php" />
+            </errorLevel>
+        </MixedReturnStatement>
         <RedundantConditionGivenDocblockType>
             <errorLevel type="suppress">
                 <!-- that test checks non-obvious things guaranteed by static analysis, just in case -->

diff --git a/src/Token.php b/src/Token.php
@@ -78,9 +78,24 @@ public function offsetExists($offset): bool
      * @deprecated Use the value, type or position property instead
      * {@inheritDoc}
      *
-     * @param array-key $offset
+     * @param O $offset
      *
      * @return mixed
+     * @psalm-return (
+     *     O is 'value'
+     *     ? string|int
+     *     : (
+     *         O is 'type'
+     *         ? T|null
+     *         : (
+     *             O is 'position'
+     *             ? int
+     *             : mixed
+     *         )
+     *     )
+     * )
+     *
+     * @template O of array-key
      */
     #[ReturnTypeWillChange]
     public function offsetGet($offset)