Merge branch '11.1'

sebastianbergmann · May 3, 2024 · 486935e · 486935e
2 parents daa61f6 + ba2a943
commit 486935e
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 38 deletions.
diff --git a/.psalm/baseline.xml b/.psalm/baseline.xml
@@ -736,6 +736,8 @@
       <code><![CDATA[logEventsVerboseText]]></code>
       <code><![CDATA[logEventsVerboseText]]></code>
       <code><![CDATA[logfileJunit]]></code>
+      <code><![CDATA[logfileJunit]]></code>
+      <code><![CDATA[logfileTeamcity]]></code>
       <code><![CDATA[logfileTeamcity]]></code>
       <code><![CDATA[process]]></code>
       <code><![CDATA[process]]></code>

diff --git a/src/Runner/Exception/DirectoryCannotBeCreatedException.php b/src/Runner/Exception/DirectoryCannotBeCreatedException.php
diff --git a/...eption/DirectoryDoesNotExistException.php → ...eption/DirectoryDoesNotExistException.php b/...eption/DirectoryDoesNotExistException.php → ...eption/DirectoryDoesNotExistException.php
@@ -7,7 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace PHPUnit\TextUI;
+namespace PHPUnit\Runner;
 
 use function sprintf;
 use RuntimeException;

diff --git a/src/Runner/ResultCache/DefaultResultCache.php b/src/Runner/ResultCache/DefaultResultCache.php
@@ -21,7 +21,7 @@
 use function json_decode;
 use function json_encode;
 use PHPUnit\Framework\TestStatus\TestStatus;
-use PHPUnit\Runner\DirectoryCannotBeCreatedException;
+use PHPUnit\Runner\DirectoryDoesNotExistException;
 use PHPUnit\Runner\Exception;
 use PHPUnit\Util\Filesystem;
 
@@ -130,7 +130,7 @@ public function load(): void
     public function persist(): void
     {
         if (!Filesystem::createDirectory(dirname($this->cacheFilename))) {
-            throw new DirectoryCannotBeCreatedException($this->cacheFilename);
+            throw new DirectoryDoesNotExistException(dirname($this->cacheFilename));
         }
 
         $data = [

diff --git a/src/TextUI/Application.php b/src/TextUI/Application.php
@@ -39,6 +39,7 @@
 use PHPUnit\Runner\Baseline\Writer;
 use PHPUnit\Runner\CodeCoverage;
 use PHPUnit\Runner\DeprecationCollector\Facade as DeprecationCollector;
+use PHPUnit\Runner\DirectoryDoesNotExistException;
 use PHPUnit\Runner\ErrorHandler;
 use PHPUnit\Runner\Extension\ExtensionBootstrapper;
 use PHPUnit\Runner\Extension\Facade as ExtensionFacade;
@@ -217,7 +218,7 @@ public function run(array $argv): int
                     OutputFacade::printerFor($configuration->logfileTestdoxHtml())->print(
                         (new TestDoxHtmlRenderer)->render($testDoxResult),
                     );
-                } catch (Exception $e) {
+                } catch (DirectoryDoesNotExistException|InvalidSocketException $e) {
                     EventFacade::emitter()->testRunnerTriggeredWarning(
                         sprintf(
                             'Cannot log test results in TestDox HTML format to "%s": %s',
@@ -234,7 +235,7 @@ public function run(array $argv): int
                     OutputFacade::printerFor($configuration->logfileTestdoxText())->print(
                         (new TestDoxTextRenderer)->render($testDoxResult),
                     );
-                } catch (Exception $e) {
+                } catch (DirectoryDoesNotExistException|InvalidSocketException $e) {
                     EventFacade::emitter()->testRunnerTriggeredWarning(
                         sprintf(
                             'Cannot log test results in TestDox plain text format to "%s": %s',
@@ -590,7 +591,7 @@ private function registerLogfileWriters(Configuration $configuration): void
                     OutputFacade::printerFor($configuration->logfileJunit()),
                     EventFacade::instance(),
                 );
-            } catch (Exception $e) {
+            } catch (DirectoryDoesNotExistException|InvalidSocketException $e) {
                 EventFacade::emitter()->testRunnerTriggeredWarning(
                     sprintf(
                         'Cannot log test results in JUnit XML format to "%s": %s',
@@ -609,7 +610,7 @@ private function registerLogfileWriters(Configuration $configuration): void
                     ),
                     EventFacade::instance(),
                 );
-            } catch (Exception $e) {
+            } catch (DirectoryDoesNotExistException|InvalidSocketException $e) {
                 EventFacade::emitter()->testRunnerTriggeredWarning(
                     sprintf(
                         'Cannot log test results in TeamCity format to "%s": %s',

diff --git a/src/TextUI/Output/Facade.php b/src/TextUI/Output/Facade.php
@@ -15,9 +15,9 @@
 use PHPUnit\Event\UnknownSubscriberTypeException;
 use PHPUnit\Logging\TeamCity\TeamCityLogger;
 use PHPUnit\Logging\TestDox\TestResultCollection;
+use PHPUnit\Runner\DirectoryDoesNotExistException;
 use PHPUnit\TestRunner\TestResult\TestResult;
 use PHPUnit\TextUI\Configuration\Configuration;
-use PHPUnit\TextUI\DirectoryDoesNotExistException;
 use PHPUnit\TextUI\InvalidSocketException;
 use PHPUnit\TextUI\Output\Default\ProgressPrinter\ProgressPrinter as DefaultProgressPrinter;
 use PHPUnit\TextUI\Output\Default\ResultPrinter as DefaultResultPrinter;

diff --git a/src/TextUI/Output/Printer/DefaultPrinter.php b/src/TextUI/Output/Printer/DefaultPrinter.php
@@ -19,7 +19,7 @@
 use function fwrite;
 use function str_replace;
 use function str_starts_with;
-use PHPUnit\TextUI\DirectoryDoesNotExistException;
+use PHPUnit\Runner\DirectoryDoesNotExistException;
 use PHPUnit\TextUI\InvalidSocketException;
 use PHPUnit\Util\Filesystem;