Fix

vimeo · Oct 22, 2023 · 292ed06 · 292ed06
1 parent e8b7b30
commit 292ed06
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 23 deletions.
diff --git a/composer.json b/composer.json
@@ -50,6 +50,7 @@
         "amphp/phpunit-util": "^3",
         "bamarni/composer-bin-plugin": "^1.4",
         "brianium/paratest": "^6.9",
+        "dg/bypass-finals": "^1.5",
         "mockery/mockery": "^1.5",
         "nunomaduro/mock-final-classes": "^1.1",
         "php-parallel-lint/php-parallel-lint": "^1.2",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
+         bootstrap="tests/autoload.php"
          backupGlobals="false"
          beStrictAboutCoversAnnotation="true"
          beStrictAboutOutputDuringTests="true"

diff --git a/src/Psalm/Internal/Type/TypeExpander.php b/src/Psalm/Internal/Type/TypeExpander.php
@@ -323,28 +323,6 @@ public static function expandAtomic(
                 ];
             }
 
-            /** @psalm-suppress DeprecatedProperty For backwards compatibility, we have to keep this here. */
-            foreach ($return_type->extra_types ?? [] as $alias) {
-                $more_recursively_fleshed_out_types = self::expandAtomic(
-                    $codebase,
-                    $alias,
-                    $self_class,
-                    $static_class_type,
-                    $parent_class,
-                    $evaluate_class_constants,
-                    $evaluate_conditional_types,
-                    $final,
-                    $expand_generic,
-                    $expand_templates,
-                    $throw_on_unresolvable_constant,
-                );
-
-                $recursively_fleshed_out_types = [
-                    ...$more_recursively_fleshed_out_types,
-                    ...$recursively_fleshed_out_types,
-                ];
-            }
-
             return $recursively_fleshed_out_types;
         }
 

diff --git a/tests/autoload.php b/tests/autoload.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+use DG\BypassFinals;
+
+require __DIR__ . '/../vendor/autoload.php';
+
+BypassFinals::enable();