Merge branch '10.1'

sebastianbergmann · May 31, 2023 · e9e6afb · e9e6afb
2 parents 8d9c813 + fb20bac
commit e9e6afb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -271,7 +271,7 @@
         'phpdoc_summary' => true,
         'phpdoc_tag_casing' => true,
         'phpdoc_tag_type' => true,
-        'phpdoc_to_comment' => true,
+        'phpdoc_to_comment' => false,
         'phpdoc_trim' => true,
         'phpdoc_trim_consecutive_blank_line_separation' => true,
         'phpdoc_types' => ['groups' => ['simple', 'meta']],

diff --git a/src/Runner/Extension/PharLoader.php b/src/Runner/Extension/PharLoader.php
@@ -18,6 +18,7 @@
 use PHPUnit\Event;
 use PHPUnit\Runner\Version;
 use SebastianBergmann\FileIterator\Facade as FileIteratorFacade;
+use Throwable;
 
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
@@ -75,10 +76,14 @@ public function loadPharExtensionsInDirectory(string $directory): array
                 continue;
             }
 
-            /**
-             * @psalm-suppress UnresolvableInclude
-             */
-            require $file;
+            try {
+                /** @psalm-suppress UnresolvableInclude */
+                @require $file;
+            } catch (Throwable $t) {
+                $notLoadedExtensions[] = $file . ': ' . $t->getMessage();
+
+                continue;
+            }
 
             $loadedExtensions[] = $manifest->getName()->asString() . ' ' . $manifest->getVersion()->getVersionString();